From 667383ef7156b0832d1d95b0fa4a8a1d446554d9 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Mon, 26 Aug 2024 15:22:24 +0000 Subject: [PATCH 1/3] Update version to 9.0.24-2 (cherry picked from commit 49680df86267bbc668959a26c87fe1d4dc02dd64) --- 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 10b5f74ce6604..9bef5fd7cb32c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -108,8 +108,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1009002401 - versionName "9.0.24-1" + versionCode 1009002402 + versionName "9.0.24-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 index 4b272838832bd..daf97c0ab588d 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 9.0.24.1 + 9.0.24.2 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index fff7dd6f3d555..fecfe9e016048 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.0.24.1 + 9.0.24.2 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 94f999e972c42..8b2a1c7af855b 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.0.24 CFBundleVersion - 9.0.24.1 + 9.0.24.2 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 7fdc44ecbcbde..fefc6bcfda1dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.0.24-1", + "version": "9.0.24-2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.0.24-1", + "version": "9.0.24-2", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 30f1688c70334..fe040fc9cc398 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.0.24-1", + "version": "9.0.24-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.", From fd431b8ac5ce9b4bf411412129b729dcd03955bf Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Mon, 26 Aug 2024 09:04:46 -0600 Subject: [PATCH 2/3] Merge pull request #47998 from Expensify/cristi_revert-PR47418 Revert PR 47418 (cherry picked from commit f89cb0ff37915da24b6829a1ff65085ddf2f66b2) (CP triggered by puneetlath) --- package-lock.json | 11 ++++++++--- package.json | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index fefc6bcfda1dc..9fe4529cbc355 100644 --- a/package-lock.json +++ b/package-lock.json @@ -102,8 +102,13 @@ "react-native-linear-gradient": "^2.8.1", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", +<<<<<<< HEAD "react-native-onyx": "2.0.64", "react-native-pager-view": "6.3.4", +======= + "react-native-onyx": "2.0.65", + "react-native-pager-view": "6.2.3", +>>>>>>> f89cb0f (Merge pull request #47998 from Expensify/cristi_revert-PR47418) "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", "react-native-permissions": "^3.10.0", @@ -37574,9 +37579,9 @@ } }, "node_modules/react-native-pager-view": { - "version": "6.3.4", - "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-6.3.4.tgz", - "integrity": "sha512-4PEQd52EOwWcfiFJZ4VGSlY+GZfumvUzNbAozsMEgJaLvOHOMMl+Arfsc0txgtGdS49uEiHFLLZthZQzxx/Mog==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-6.2.3.tgz", + "integrity": "sha512-dqVpXWFtPNfD3D2QQQr8BP+ullS5MhjRJuF8Z/qml4QTILcrWaW8F5iAxKkQR3Jl0ikcEryG/+SQlNcwlo0Ggg==", "peerDependencies": { "react": "*", "react-native": "*" diff --git a/package.json b/package.json index fe040fc9cc398..019d39d21dc4b 100644 --- a/package.json +++ b/package.json @@ -158,8 +158,13 @@ "react-native-linear-gradient": "^2.8.1", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", +<<<<<<< HEAD "react-native-onyx": "2.0.64", "react-native-pager-view": "6.3.4", +======= + "react-native-onyx": "2.0.65", + "react-native-pager-view": "6.2.3", +>>>>>>> f89cb0f (Merge pull request #47998 from Expensify/cristi_revert-PR47418) "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", "react-native-permissions": "^3.10.0", From 893ea5fcf0c94721f6685d8017b25cfb41058113 Mon Sep 17 00:00:00 2001 From: Cristi Paval Date: Mon, 26 Aug 2024 18:39:11 +0300 Subject: [PATCH 3/3] Fix conflicts --- package-lock.json | 5 ----- package.json | 5 ----- 2 files changed, 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9fe4529cbc355..8516d8ea25e67 100644 --- a/package-lock.json +++ b/package-lock.json @@ -102,13 +102,8 @@ "react-native-linear-gradient": "^2.8.1", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", -<<<<<<< HEAD "react-native-onyx": "2.0.64", - "react-native-pager-view": "6.3.4", -======= - "react-native-onyx": "2.0.65", "react-native-pager-view": "6.2.3", ->>>>>>> f89cb0f (Merge pull request #47998 from Expensify/cristi_revert-PR47418) "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", "react-native-permissions": "^3.10.0", diff --git a/package.json b/package.json index 019d39d21dc4b..87e9834b74a82 100644 --- a/package.json +++ b/package.json @@ -158,13 +158,8 @@ "react-native-linear-gradient": "^2.8.1", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", -<<<<<<< HEAD "react-native-onyx": "2.0.64", - "react-native-pager-view": "6.3.4", -======= - "react-native-onyx": "2.0.65", "react-native-pager-view": "6.2.3", ->>>>>>> f89cb0f (Merge pull request #47998 from Expensify/cristi_revert-PR47418) "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", "react-native-permissions": "^3.10.0",