Merge branch 'main' of github.com:Expensify/App into jpersaud_osbotif…

…y_app
Expensify · Aug 1, 2023 · c20e7ac · c20e7ac
2 parents 66bb752 + 73e097c
commit c20e7ac
Show file tree

Hide file tree

Showing 129 changed files with 2,509 additions and 2,524 deletions.
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
@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001034601
-        versionName "1.3.46-1"
+        versionCode 1001034800
+        versionName "1.3.48-0"
     }
 
     splits {

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/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.46</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.46.1</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.46</string>
+	<string>1.3.48</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.46.1</string>
+	<string>1.3.48.0</string>
 </dict>
 </plist>