Merge remote-tracking branch 'origin/main' into 27901

Author: honnamkuan

android/app/build.gradle

@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001038002
-        versionName "1.3.80-2"
+        versionCode 1001038101
+        versionName "1.3.81-1"
     }
 
     flavorDimensions "default"

ios/NewExpensify/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.80</string>
+	<string>1.3.81</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.80.2</string>
+	<string>1.3.81.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.80</string>
+	<string>1.3.81</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.80.2</string>
+	<string>1.3.81.1</string>
 </dict>
 </plist>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.80-2",
+  "version": "1.3.81-1",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

package.json

@@ -46,11 +46,11 @@ function EmojiSkinToneList(props) {
             {!isSkinToneListVisible && (
                 <PressableWithoutFeedback
                     onPress={toggleIsSkinToneListVisible}
-                    style={[styles.flex1, styles.flexRow, styles.alignSelfCenter, styles.justifyContentStart, styles.alignItemsCenter]}
+                    style={[styles.flexRow, styles.alignSelfCenter, styles.justifyContentStart, styles.alignItemsCenter]}
                     accessibilityLabel={props.translate('emojiPicker.skinTonePickerLabel')}
                     accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                 >
-                    <View style={[styles.emojiItem, styles.justifyContentCenter]}>
+                    <View style={[styles.emojiItem, styles.wAuto, styles.justifyContentCenter]}>
                         <Text style={[styles.emojiText, styles.ph2, styles.textNoWrap]}>{currentSkinTone.code}</Text>
                     </View>
                     <Text style={[styles.emojiSkinToneTitle]}>{props.translate('emojiPicker.skinTonePickerLabel')}</Text>

src/components/EmojiPicker/EmojiSkinToneList.js

@@ -8,7 +8,6 @@ import styles from '../../styles/styles';
 import * as StyleUtils from '../../styles/StyleUtils';
 import getModalStyles from '../../styles/getModalStyles';
 import withWindowDimensions from '../withWindowDimensions';
-import usePrevious from '../../hooks/usePrevious';
 
 function Popover(props) {
     const {onOpen, close} = React.useContext(PopoverContext);
@@ -25,8 +24,6 @@ function Popover(props) {
         props.outerStyle,
     );
 
-    const prevIsVisible = usePrevious(props.isVisible);
-
     React.useEffect(() => {
         if (props.isVisible) {
             props.onModalShow();
@@ -43,7 +40,7 @@ function Popover(props) {
         Modal.willAlertModalBecomeVisible(props.isVisible);
 
         // We prevent setting closeModal function to null when the component is invisible the first time it is rendered
-        if (prevIsVisible === props.isVisible && (!firstRenderRef.current || !props.isVisible)) {
+        if (!firstRenderRef.current || !props.isVisible) {
             firstRenderRef.current = false;
             return;
         }
@@ -52,7 +49,7 @@ function Popover(props) {
 
         // We want this effect to run strictly ONLY when isVisible prop changes
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [props.isVisible, prevIsVisible]);
+    }, [props.isVisible]);
 
     if (!props.isVisible) {
         return null;

src/components/PopoverWithoutOverlay/index.js

@@ -1779,7 +1779,6 @@ const styles = (theme) => ({
     },
 
     emojiSkinToneTitle: {
-        width: '100%',
         ...spacing.pv1,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontWeight: fontWeightBold,