Merge branch 'main' of github.com:teneeto/Expensify into fix/50818/at…

…tachment-modal-position
Expensify · Nov 14, 2024 · c4da175 · c4da175
2 parents 3883b5e + 512ae9f
commit c4da175
Show file tree

Hide file tree

Showing 22 changed files with 608 additions and 30 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009006200
-        versionName "9.0.62-0"
+        versionCode 1009006202
+        versionName "9.0.62-2"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.62.0</string>
+	<string>9.0.62.2</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.62.0</string>
+	<string>9.0.62.2</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.62</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.62.0</string>
+	<string>9.0.62.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.62-0",
+  "version": "9.0.62-2",
   "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.",
@@ -161,7 +161,7 @@
     "react-native-plaid-link-sdk": "11.11.0",
     "react-native-qrcode-svg": "6.3.11",
     "react-native-quick-sqlite": "git+https://github.com/margelo/react-native-quick-sqlite#99f34ebefa91698945f3ed26622e002bd79489e0",
-    "react-native-reanimated": "3.16.1",
+    "react-native-reanimated": "3.15.3",
     "react-native-release-profiler": "^0.2.1",
     "react-native-render-html": "6.3.1",
     "react-native-safe-area-context": "4.10.9",

diff --git a/...ve-reanimated+3.16.1+001+hybrid-app.patch → ...ve-reanimated+3.15.3+001+hybrid-app.patch b/...ve-reanimated+3.16.1+001+hybrid-app.patch → ...ve-reanimated+3.15.3+001+hybrid-app.patch
@@ -1,9 +1,9 @@
 diff --git a/node_modules/react-native-reanimated/scripts/reanimated_utils.rb b/node_modules/react-native-reanimated/scripts/reanimated_utils.rb
-index 9fc7b15..e453d84 100644
+index af0935f..ccd2a9e 100644
 --- a/node_modules/react-native-reanimated/scripts/reanimated_utils.rb
 +++ b/node_modules/react-native-reanimated/scripts/reanimated_utils.rb
 @@ -17,7 +17,11 @@ def find_config()
-     :react_native_reanimated_dir_from_pods_root => nil,
+     :react_native_common_dir => nil,
    }
 
 -  react_native_node_modules_dir = File.join(File.dirname(`cd "#{Pod::Config.instance.installation_root.to_s}" && node --print "require.resolve('react-native/package.json')"`), '..')

diff --git a/...ed+3.16.1+002+dontWhitelistTextProp.patch → ...ed+3.15.3+002+dontWhitelistTextProp.patch b/...ed+3.16.1+002+dontWhitelistTextProp.patch → ...ed+3.15.3+002+dontWhitelistTextProp.patch
diff --git a/patches/react-native-reanimated+3.15.3+003+fixNullViewTag.patch b/patches/react-native-reanimated+3.15.3+003+fixNullViewTag.patch
@@ -0,0 +1,15 @@
+diff --git a/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx b/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx
+index 577b4a7..c60f0f8 100644
+--- a/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx
++++ b/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx
+@@ -481,7 +481,9 @@ export function createAnimatedComponent(
+           ? (ref as HTMLElement)
+           : findNodeHandle(ref as Component);
+
+-        this._componentViewTag = tag as number;
++        if (tag !== null) {
++          this._componentViewTag = tag as number;
++        }
+
+         const { layout, entering, exiting, sharedTransitionTag } = this.props;
+         if (
diff --git a/src/components/UploadFile.tsx b/src/components/UploadFile.tsx
@@ -69,7 +69,9 @@ function UploadFile({
     const theme = useTheme();
 
     const handleFileUpload = (files: FileObject[]) => {
-        const totalSize = files.reduce((sum, file) => sum + (file.size ?? 0), 0);
+        const resultedFiles = [...uploadedFiles, ...files];
+
+        const totalSize = resultedFiles.reduce((sum, file) => sum + (file.size ?? 0), 0);
 
         if (totalFilesSizeLimit) {
             if (totalSize > totalFilesSizeLimit) {
@@ -78,7 +80,7 @@ function UploadFile({
             }
         }
 
-        if (fileLimit && files.length > 0 && files.length > fileLimit) {
+        if (fileLimit && resultedFiles.length > 0 && resultedFiles.length > fileLimit) {
             setError(translate('attachmentPicker.tooManyFiles', {fileLimit}));
             return;
         }
@@ -98,6 +100,7 @@ function UploadFile({
 
         onInputChange(newFilesToUpload);
         onUpload(newFilesToUpload);
+        setError('');
     };
 
     return (
@@ -123,21 +126,21 @@ function UploadFile({
             {uploadedFiles.map((file) => (
                 <View
                     style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentCenter, styles.border, styles.p5, styles.mt3]}
-                    key={file.uri}
+                    key={file.name}
                 >
                     <Icon
                         src={Expensicons.Paperclip}
                         fill={theme.icon}
                         medium
                     />
                     <Text
-                        style={[styles.ml2, styles.mr2, styles.textBold, styles.breakWord, styles.w100]}
+                        style={[styles.ml2, styles.mr2, styles.textBold, styles.breakWord, styles.w100, styles.flexShrink1]}
                         numberOfLines={2}
                     >
                         {file.name}
                     </Text>
                     <PressableWithFeedback
-                        onPress={() => onRemove(file?.uri ?? '')}
+                        onPress={() => onRemove(file?.name ?? '')}
                         role={CONST.ROLE.BUTTON}
                         accessibilityLabel={translate('common.remove')}
                     >
@@ -151,7 +154,7 @@ function UploadFile({
             ))}
             {errorText !== '' && (
                 <DotIndicatorMessage
-                    textStyles={[styles.formError]}
+                    style={[styles.formError, styles.mt3]}
                     type="error"
                     messages={{errorText}}
                 />

diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -83,6 +83,7 @@ import type {
     InvalidPropertyParams,
     InvalidValueParams,
     IssueVirtualCardParams,
+    LastFourDigitsParams,
     LastSyncAccountingParams,
     LastSyncDateParams,
     LocalTimeParams,
@@ -2289,6 +2290,16 @@ const translations = {
         findCountry: 'Find country',
         selectCountry: 'Select country',
     },
+    bankInfoStep: {
+        whatAreYour: 'What are your business bank account details?',
+        letsDoubleCheck: 'Let’s double check that everything looks fine.',
+        thisBankAccount: 'This bank account will be used for business payments on your workspace',
+        accountNumber: 'Account number',
+        bankStatement: 'Bank statement',
+        chooseFile: 'Choose file',
+        uploadYourLatest: 'Upload your latest statement',
+        pleaseUpload: ({lastFourDigits}: LastFourDigitsParams) => `Please upload the most recent monthly statement for your business bank account ending in ${lastFourDigits}.`,
+    },
     signerInfoStep: {
         signerInfo: 'Signer info',
     },

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -81,6 +81,7 @@ import type {
     InvalidPropertyParams,
     InvalidValueParams,
     IssueVirtualCardParams,
+    LastFourDigitsParams,
     LastSyncAccountingParams,
     LastSyncDateParams,
     LocalTimeParams,
@@ -2313,6 +2314,16 @@ const translations = {
         findCountry: 'Encontrar país',
         selectCountry: 'Seleccione su país',
     },
+    bankInfoStep: {
+        whatAreYour: '¿Cuáles son los detalles de tu cuenta bancaria comercial?',
+        letsDoubleCheck: 'Verifiquemos que todo esté bien.',
+        thisBankAccount: 'Esta cuenta bancaria se utilizará para pagos comerciales en tu espacio de trabajo.',
+        accountNumber: 'Número de cuenta',
+        bankStatement: 'Extracto bancario',
+        chooseFile: 'Elegir archivo',
+        uploadYourLatest: '¿Cuáles son los detalles de tu cuenta bancaria comercial?',
+        pleaseUpload: ({lastFourDigits}: LastFourDigitsParams) => `Por favor suba el estado de cuenta mensual más reciente de tu cuenta bancaria comercial que termina en ${lastFourDigits}.`,
+    },
     signerInfoStep: {
         signerInfo: 'Información del firmante',
     },

diff --git a/src/languages/params.ts b/src/languages/params.ts
@@ -543,6 +543,10 @@ type FileLimitParams = {
     fileLimit: number;
 };
 
+type LastFourDigitsParams = {
+    lastFourDigits: string;
+};
+
 type CompanyCardBankName = {
     bankName: string;
 };
@@ -641,6 +645,7 @@ export type {
     HeldRequestParams,
     InstantSummaryParams,
     IssueVirtualCardParams,
+    LastFourDigitsParams,
     LocalTimeParams,
     LogSizeParams,
     LoggedInAsParams,