From 932e99de3f1ad7425731446fc0d5c9f9e1ce6743 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 15 Feb 2024 01:02:42 +0000 Subject: [PATCH 1/3] Update version to 1.4.41-12 (cherry picked from commit bd695309fe28bb9e0c62d73812dc8e078722c8a6) --- 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 6349f631faea..a49e75c90c76 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -98,8 +98,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001044109 - versionName "1.4.41-9" + versionCode 1001044112 + versionName "1.4.41-12" } flavorDimensions "default" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 08b216f30224..771353644933 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 1.4.41.9 + 1.4.41.12 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 05310bade97e..b0b5eff9b6f0 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.4.41.9 + 1.4.41.12 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index d3ff258cc733..fd2c9008ac25 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 1.4.41 CFBundleVersion - 1.4.41.9 + 1.4.41.12 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 9d1a52b1cec9..684bd4afcb2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.4.41-9", + "version": "1.4.41-12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.4.41-9", + "version": "1.4.41-12", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 4f4178b8b653..fa01f9f96018 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.4.41-9", + "version": "1.4.41-12", "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 682e4f5f57941d3603b230156e1d6a07a613bf22 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Wed, 14 Feb 2024 17:58:55 -0700 Subject: [PATCH 2/3] Merge pull request #36550 from infinitered/trevor-coleman/violations/merchant-fix fix(Violations): fix behaviour of merchant errors (cherry picked from commit 68b93500d11903b581847ee13d2c4d1ea57774ac) --- src/components/ReportActionItem/MoneyRequestView.tsx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx index 6b16f272e4c8..664e0a0a58b6 100644 --- a/src/components/ReportActionItem/MoneyRequestView.tsx +++ b/src/components/ReportActionItem/MoneyRequestView.tsx @@ -334,9 +334,19 @@ function MoneyRequestView({ interactive={canEditMerchant} shouldShowRightIcon={canEditMerchant} titleStyle={styles.flex1} +<<<<<<< HEAD onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.MERCHANT))} brickRoadIndicator={hasViolations('merchant') || (hasErrors && isEmptyMerchant && isPolicyExpenseChat) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined} error={hasErrors && isPolicyExpenseChat && isEmptyMerchant ? translate('common.error.enterMerchant') : ''} +======= + onPress={() => + Navigation.navigate( + ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(CONST.IOU.ACTION.EDIT, CONST.IOU.TYPE.REQUEST, transaction?.transactionID ?? '', report.reportID), + ) + } + brickRoadIndicator={getErrorForField('merchant') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined} + error={getErrorForField('merchant')} +>>>>>>> 68b9350 (Merge pull request #36550 from infinitered/trevor-coleman/violations/merchant-fix) /> )} From e658595db912e5fdcd476847d2400675c8045b01 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Wed, 14 Feb 2024 18:13:27 -0700 Subject: [PATCH 3/3] Fix merge conflict --- src/components/ReportActionItem/MoneyRequestView.tsx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx index 664e0a0a58b6..ed5d5a6cb01b 100644 --- a/src/components/ReportActionItem/MoneyRequestView.tsx +++ b/src/components/ReportActionItem/MoneyRequestView.tsx @@ -334,11 +334,6 @@ function MoneyRequestView({ interactive={canEditMerchant} shouldShowRightIcon={canEditMerchant} titleStyle={styles.flex1} -<<<<<<< HEAD - onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.MERCHANT))} - brickRoadIndicator={hasViolations('merchant') || (hasErrors && isEmptyMerchant && isPolicyExpenseChat) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined} - error={hasErrors && isPolicyExpenseChat && isEmptyMerchant ? translate('common.error.enterMerchant') : ''} -======= onPress={() => Navigation.navigate( ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(CONST.IOU.ACTION.EDIT, CONST.IOU.TYPE.REQUEST, transaction?.transactionID ?? '', report.reportID), @@ -346,7 +341,6 @@ function MoneyRequestView({ } brickRoadIndicator={getErrorForField('merchant') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined} error={getErrorForField('merchant')} ->>>>>>> 68b9350 (Merge pull request #36550 from infinitered/trevor-coleman/violations/merchant-fix) /> )}