From b020eee02534d0064c71736c30f5eb75afba7a08 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 25 Oct 2024 10:44:06 +0000 Subject: [PATCH 01/12] Update version to 9.0.54-1 (cherry picked from commit 904e715637e62cef07c5a363a309c1b107f8ca8a) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- ios/NotificationServiceExtension/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 802b04d71613..5ce4d0e5fddf 100644 --- 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 1009005400 - versionName "9.0.54-0" + versionCode 1009005401 + versionName "9.0.54-1" // 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 index 74a45675a3be..361113013ae4 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 9.0.54.0 + 9.0.54.1 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index a4a8f2de743b..cb867d7af0b5 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.0.54.0 + 9.0.54.1 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index aa916c957ebd..c7c9879bb2ab 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.0.54 CFBundleVersion - 9.0.54.0 + 9.0.54.1 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 97efca05f12f..02597aafd9fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.0.54-0", + "version": "9.0.54-1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.0.54-0", + "version": "9.0.54-1", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 96efa856e16f..6f63136e08ba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.0.54-0", + "version": "9.0.54-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.", From 080b4a9e3ac04dbbbcb4593054d7d0f4b562e99a Mon Sep 17 00:00:00 2001 From: Jules Date: Fri, 25 Oct 2024 11:28:29 +0100 Subject: [PATCH 02/12] Merge pull request #51455 from Expensify/jules-minorReadmeChangeToBumpApp [NO QA] Minor formatting alignment (cherry picked from commit 3a3f182cb9bf5083d686eb669b0ca11b15c1f1f0) (CP triggered by Julesssss) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4a691045e7c2..730e745e368a 100644 --- a/README.md +++ b/README.md @@ -274,7 +274,7 @@ web: `npm run symbolicate-release:web` - Perfetto UI (https://ui.perfetto.dev/) - Google Chrome's Tracing UI (chrome://tracing) ---- +---- # App Structure and Conventions From e822a3d972bc298574f9cc1c6bb3851f672f1ba8 Mon Sep 17 00:00:00 2001 From: Anas Up Date: Fri, 25 Oct 2024 17:34:08 -0400 Subject: [PATCH 03/12] initialize when isJestEnv is false --- __mocks__/@react-navigation/native/index.ts | 24 ++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/__mocks__/@react-navigation/native/index.ts b/__mocks__/@react-navigation/native/index.ts index 5bcafdc1856c..e5af56f727d3 100644 --- a/__mocks__/@react-navigation/native/index.ts +++ b/__mocks__/@react-navigation/native/index.ts @@ -18,7 +18,7 @@ const {triggerTransitionEnd, addListener} = isJestEnv const useNavigation = () => ({ ...realReactNavigation.useNavigation, - navigate: jest.fn(), + navigate: isJestEnv ? jest.fn() : () => {}, getState: () => ({ routes: [], }), @@ -30,17 +30,17 @@ type NativeNavigationMock = typeof ReactNavigation & { }; export * from '@react-navigation/core'; -const Link = realReactNavigation.Link; -const LinkingContext = realReactNavigation.LinkingContext; -const NavigationContainer = realReactNavigation.NavigationContainer; -const ServerContainer = realReactNavigation.ServerContainer; -const DarkTheme = realReactNavigation.DarkTheme; -const DefaultTheme = realReactNavigation.DefaultTheme; -const ThemeProvider = realReactNavigation.ThemeProvider; -const useLinkBuilder = realReactNavigation.useLinkBuilder; -const useLinkProps = realReactNavigation.useLinkProps; -const useLinkTo = realReactNavigation.useLinkTo; -const useScrollToTop = realReactNavigation.useScrollToTop; +const Link = isJestEnv ? realReactNavigation.Link : () => null; +const LinkingContext = isJestEnv ? realReactNavigation.LinkingContext : () => null; +const NavigationContainer = isJestEnv ? realReactNavigation.NavigationContainer : () => null; +const ServerContainer = isJestEnv ? realReactNavigation.ServerContainer : () => null; +const DarkTheme = isJestEnv ? realReactNavigation.DarkTheme : {}; +const DefaultTheme = isJestEnv ? realReactNavigation.DefaultTheme : {}; +const ThemeProvider = isJestEnv ? realReactNavigation.ThemeProvider : () => null; +const useLinkBuilder = isJestEnv ? realReactNavigation.useLinkBuilder : () => null; +const useLinkProps = isJestEnv ? realReactNavigation.useLinkProps : () => null; +const useLinkTo = isJestEnv ? realReactNavigation.useLinkTo : () => null; +const useScrollToTop = isJestEnv ? realReactNavigation.useScrollToTop : () => null; export { // Overriden modules useIsFocused, From c7df9a7b03d26a9d9772e8faee69332a6297a065 Mon Sep 17 00:00:00 2001 From: Anaslancer Date: Sat, 26 Oct 2024 16:01:16 -0400 Subject: [PATCH 04/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 730e745e368a..4a691045e7c2 100644 --- a/README.md +++ b/README.md @@ -274,7 +274,7 @@ web: `npm run symbolicate-release:web` - Perfetto UI (https://ui.perfetto.dev/) - Google Chrome's Tracing UI (chrome://tracing) ----- +--- # App Structure and Conventions From 7a672075b7dddf1b2e34d77f50babedf72ae9810 Mon Sep 17 00:00:00 2001 From: Anaslancer Date: Mon, 28 Oct 2024 07:04:43 -0400 Subject: [PATCH 05/12] Update build.gradle --- android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 5ce4d0e5fddf..802b04d71613 100644 --- 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 1009005401 - versionName "9.0.54-1" + versionCode 1009005400 + versionName "9.0.54-0" // 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" From 658f468faf4165d22d5b15cbaa22b3d0011d2e33 Mon Sep 17 00:00:00 2001 From: Anaslancer Date: Mon, 28 Oct 2024 07:05:26 -0400 Subject: [PATCH 06/12] Update Info.plist --- ios/NewExpensify/Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 361113013ae4..74a45675a3be 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 9.0.54.1 + 9.0.54.0 FullStory OrgId From df248a1cf04ba53545187cb8b24c0bbf87931b60 Mon Sep 17 00:00:00 2001 From: Anaslancer Date: Mon, 28 Oct 2024 07:06:29 -0400 Subject: [PATCH 07/12] Update Info.plist --- ios/NewExpensifyTests/Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index cb867d7af0b5..a4a8f2de743b 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.0.54.1 + 9.0.54.0 From c4a5b610d0e26162ccfc187b1c8a80b48380ed68 Mon Sep 17 00:00:00 2001 From: Anaslancer Date: Mon, 28 Oct 2024 07:06:51 -0400 Subject: [PATCH 08/12] Update Info.plist --- ios/NotificationServiceExtension/Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index c7c9879bb2ab..aa916c957ebd 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.0.54 CFBundleVersion - 9.0.54.1 + 9.0.54.0 NSExtension NSExtensionPointIdentifier From a724319c3f235e2a8beccd4d629c604272660256 Mon Sep 17 00:00:00 2001 From: Anaslancer Date: Mon, 28 Oct 2024 07:07:29 -0400 Subject: [PATCH 09/12] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f63136e08ba..96efa856e16f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.0.54-1", + "version": "9.0.54-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.", From 862c2eaaa78812a18b7799fd0371b616c79e2ce0 Mon Sep 17 00:00:00 2001 From: Anaslancer Date: Mon, 28 Oct 2024 07:08:55 -0400 Subject: [PATCH 10/12] Update package-lock.json --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 02597aafd9fc..97efca05f12f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.0.54-1", + "version": "9.0.54-0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.0.54-1", + "version": "9.0.54-0", "hasInstallScript": true, "license": "MIT", "dependencies": { From 3e766cc3f9d8ec11d554ecdc2c650f1ab1b949b7 Mon Sep 17 00:00:00 2001 From: Anaslancer Date: Mon, 28 Oct 2024 10:27:14 -0400 Subject: [PATCH 11/12] Update index.ts --- __mocks__/@react-navigation/native/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/__mocks__/@react-navigation/native/index.ts b/__mocks__/@react-navigation/native/index.ts index e5af56f727d3..c6b9fa5776b1 100644 --- a/__mocks__/@react-navigation/native/index.ts +++ b/__mocks__/@react-navigation/native/index.ts @@ -16,8 +16,9 @@ const {triggerTransitionEnd, addListener} = isJestEnv addListener: () => {}, }; +const realOrMockedUseNavigation = isJestEnv ? realReactNavigation.useNavigation : {}; const useNavigation = () => ({ - ...realReactNavigation.useNavigation, + ...realOrMockedUseNavigation, navigate: isJestEnv ? jest.fn() : () => {}, getState: () => ({ routes: [], From 06eab282898024d52220ace0ad821805fc822b07 Mon Sep 17 00:00:00 2001 From: Anaslancer Date: Mon, 28 Oct 2024 16:13:35 -0400 Subject: [PATCH 12/12] Update index.ts --- __mocks__/@react-navigation/native/index.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/__mocks__/@react-navigation/native/index.ts b/__mocks__/@react-navigation/native/index.ts index c6b9fa5776b1..55d19124e65e 100644 --- a/__mocks__/@react-navigation/native/index.ts +++ b/__mocks__/@react-navigation/native/index.ts @@ -42,6 +42,9 @@ const useLinkBuilder = isJestEnv ? realReactNavigation.useLinkBuilder : () => nu const useLinkProps = isJestEnv ? realReactNavigation.useLinkProps : () => null; const useLinkTo = isJestEnv ? realReactNavigation.useLinkTo : () => null; const useScrollToTop = isJestEnv ? realReactNavigation.useScrollToTop : () => null; +const useRoute = isJestEnv ? realReactNavigation.useRoute : () => ({params: {}}); +const useFocusEffect = isJestEnv ? realReactNavigation.useFocusEffect : (callback: () => void) => callback(); + export { // Overriden modules useIsFocused, @@ -61,6 +64,8 @@ export { useLinkProps, useLinkTo, useScrollToTop, + useRoute, + useFocusEffect, }; export type {NativeNavigationMock};