Merge remote-tracking branch 'origin/main' into feature/rn-update-0.72

Expensify · Aug 1, 2023 · 6c8e524 · 6c8e524
2 parents 2b07cf5 + 52b8ddc
commit 6c8e524
Show file tree

Hide file tree

Showing 159 changed files with 3,821 additions and 3,162 deletions.
diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml
@@ -1,6 +1,14 @@
 name: Create new version
 
 on:
+  workflow_dispatch:
+    inputs:
+      SEMVER_LEVEL:
+        description: One of {BUILD, PATCH, MINOR, MAJOR}
+        required: true
+        default: BUILD
+        type: string
+
   workflow_call:
     inputs:
       SEMVER_LEVEL:

diff --git a/.storybook/preview.js b/.storybook/preview.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import Onyx from 'react-native-onyx';
 import {SafeAreaProvider} from 'react-native-safe-area-context';
+import {PortalProvider} from '@gorhom/portal';
 import './fonts.css';
 import ComposeProviders from '../src/components/ComposeProviders';
 import HTMLEngineProvider from '../src/components/HTMLEngineProvider';
@@ -14,7 +15,7 @@ Onyx.init({
 
 const decorators = [
     (Story) => (
-        <ComposeProviders components={[OnyxProvider, LocaleContextProvider, HTMLEngineProvider, SafeAreaProvider]}>
+        <ComposeProviders components={[OnyxProvider, LocaleContextProvider, HTMLEngineProvider, SafeAreaProvider, PortalProvider]}>
             <Story />
         </ComposeProviders>
     ),

diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js
@@ -27,6 +27,7 @@ module.exports = ({config}) => {
         'react-native$': '@expensify/react-native-web',
         'react-native-web': '@expensify/react-native-web',
         '@react-native-community/netinfo': path.resolve(__dirname, '../__mocks__/@react-native-community/netinfo.js'),
+        '@react-navigation/native': path.resolve(__dirname, '../__mocks__/@react-navigation/native'),
     };
 
     // Necessary to overwrite the values in the existing DefinePlugin hardcoded to the Config staging values

diff --git a/__mocks__/@react-navigation/native/index.js b/__mocks__/@react-navigation/native/index.js
@@ -0,0 +1,8 @@
+import {useIsFocused as realUseIsFocused} from '@react-navigation/native';
+
+// We only want this mocked for storybook, not jest
+const useIsFocused = process.env.NODE_ENV === 'test' ? realUseIsFocused : () => true;
+
+export * from '@react-navigation/core';
+export * from '@react-navigation/native';
+export {useIsFocused};
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -86,8 +86,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001034508
-        versionName "1.3.45-8"
+        versionCode 1001034800
+        versionName "1.3.48-0"
     }
 
     signingConfigs {

diff --git a/assets/animations/ExpensifyLounge.json b/assets/animations/ExpensifyLounge.json
diff --git a/assets/animations/Fireworks.json b/assets/animations/Fireworks.json
diff --git a/assets/animations/Hands.json b/assets/animations/Hands.json
diff --git a/assets/animations/PreferencesDJ.json b/assets/animations/PreferencesDJ.json
diff --git a/assets/animations/ReviewingBankInfo.json b/assets/animations/ReviewingBankInfo.json
diff --git a/assets/animations/WorkspacePlanet.json b/assets/animations/WorkspacePlanet.json
diff --git a/contributingGuides/TS_STYLE.md b/contributingGuides/TS_STYLE.md
@@ -489,7 +489,23 @@ declare module "external-library-name" {
 
 - If you're migrating a module that doesn't have a default implementation (i.e. `index.ts`, e.g. `getPlatform`), convert `index.website.js` to `index.ts`. Without `index.ts`, TypeScript cannot get type information where the module is imported.
 
-- Deprecate the usage of `underscore`. Use the corresponding methods from `lodash`. eslint: [`no-restricted-imports`](https://eslint.org/docs/latest/rules/no-restricted-imports)
+- Deprecate the usage of `underscore`. Use vanilla methods from JS instead. Only use `lodash` when there is no easy vanilla alternative (eg. `lodashMerge`). eslint: [`no-restricted-imports`](https://eslint.org/docs/latest/rules/no-restricted-imports)
+
+```ts
+// BAD
+var arr = [];
+_.each(arr, () => {});
+
+// GOOD
+var arr = [];
+arr.forEach(() => {});
+
+// BAD
+lodashGet(object, ['foo'], 'bar');
+
+// GOOD
+object?.foo ?? 'bar';
+```
 
 - Found type bugs. Now what?
 

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.45</string>
+	<string>1.3.48</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.45.8</string>
+	<string>1.3.48.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.45</string>
+	<string>1.3.48</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.45.8</string>
+	<string>1.3.48.0</string>
 </dict>
 </plist>
diff --git a/ios/expensify_chat_dev.mobileprovision.gpg b/ios/expensify_chat_dev.mobileprovision.gpg