Merge branch 'main' into fix/22613

Author: Pujan92

.github/ISSUE_TEMPLATE/DesignDocIssue.md

@@ -8,9 +8,9 @@ Main issue: <Issue Link>
 Doc section: <Doc Link>
 Project: <Project Link>
 
-# <Feature Description>
+# Feature Description
 <!-- Describe the section of the doc that this issue is covering, along with any relevant screenshots -->
 
 # Manual Test Steps
 
-#Automated Tests
+# Automated Tests

android/app/build.gradle

@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001034306
-        versionName "1.3.43-6"
+        versionCode 1001034400
+        versionName "1.3.44-0"
     }
 
     splits {

ios/NewExpensify/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.43</string>
+	<string>1.3.44</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.43.6</string>
+	<string>1.3.44.0</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.43</string>
+	<string>1.3.44</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.43.6</string>
+	<string>1.3.44.0</string>
 </dict>
 </plist>

ios/expensify_chat_adhoc.mobileprovision.gpg

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.43-6",
+  "version": "1.3.44-0",
   "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.",
@@ -119,7 +119,7 @@
     "react-native-pdf": "^6.6.2",
     "react-native-performance": "^4.0.0",
     "react-native-permissions": "^3.0.1",
-    "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#107b3786ae6bc155dec05c7fc5ee525d3421dc21",
+    "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#eae05855286dc699954415cc1d629bfd8e8e47e2",
     "react-native-plaid-link-sdk": "^10.0.0",
     "react-native-qrcode-svg": "^6.2.0",
     "react-native-quick-sqlite": "^8.0.0-beta.2",

package-lock.json

@@ -35,7 +35,6 @@ export default {
     SETTINGS_WORKSPACES: 'settings/workspaces',
     SETTINGS_SECURITY: 'settings/security',
     SETTINGS_CLOSE: 'settings/security/closeAccount',
-    SETTINGS_PASSWORD: 'settings/security/password',
     SETTINGS_ABOUT: 'settings/about',
     SETTINGS_APP_DOWNLOAD_LINKS: 'settings/about/app-download-links',
     SETTINGS_PAYMENTS: 'settings/payments',

package.json

@@ -226,6 +226,7 @@ class AvatarWithImagePicker extends React.Component {
 
             this.setState({
                 isAvatarCropModalOpen: true,
+                isMenuVisible: false,
                 imageUri: image.uri,
                 imageName: image.name,
                 imageType: image.type,
@@ -279,6 +280,7 @@ class AvatarWithImagePicker extends React.Component {
                     onPress={() => this.setState({isMenuVisible: true})}
                     accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
                     accessibilityLabel={this.props.translate('avatarWithImagePicker.editImage')}
+                    disabled={this.state.isAvatarCropModalOpen}
                 >
                     <View style={[styles.pRelative, styles.avatarLarge]}>
                         <OfflineWithFeedback

src/ROUTES.js

@@ -10,6 +10,7 @@ import themeColors from '../../styles/themes/default';
 import updateIsFullComposerAvailable from '../../libs/ComposerUtils/updateIsFullComposerAvailable';
 import * as ComposerUtils from '../../libs/ComposerUtils';
 import * as Browser from '../../libs/Browser';
+import * as StyleUtils from '../../styles/StyleUtils';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../withWindowDimensions';
 import compose from '../../libs/compose';
 import styles from '../../styles/styles';
@@ -306,11 +307,18 @@ class Composer extends React.Component {
      * @param {ClipboardEvent} event
      */
     handlePaste(event) {
-        if (!this.props.checkComposerVisibility()) {
+        event.preventDefault();
+
+        const isVisible = this.props.checkComposerVisibility();
+        const isFocused = this.textInput.isFocused();
+
+        if (!(isVisible || isFocused)) {
             return;
         }
 
-        event.preventDefault();
+        if (this.textInput.id !== event.target.id) {
+            return;
+        }
 
         const {files, types} = event.clipboardData;
         const TEXT_HTML = 'text/html';
@@ -475,6 +483,7 @@ class Composer extends React.Component {
                         // We are hiding the scrollbar to prevent it from reducing the text input width,
                         // so we can get the correct scroll height while calculating the number of lines.
                         this.state.numberOfLines < this.props.maxLines ? styles.overflowHidden : {},
+                        StyleUtils.getComposeTextAreaPadding(this.props.numberOfLines),
                     ]}
                     /* eslint-disable-next-line react/jsx-props-no-spreading */
                     {...propsWithoutStyles}