From 1d1c61f6bb2ab3a45a0255c45fda2402c63e141c Mon Sep 17 00:00:00 2001 From: Puneet Lath Date: Mon, 5 Sep 2022 10:41:54 +0100 Subject: [PATCH 1/3] Get pending action proptypes from CONST --- src/pages/settings/InitialSettingsPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js index df2fbd8afe0b..24e0968b04e3 100755 --- a/src/pages/settings/InitialSettingsPage.js +++ b/src/pages/settings/InitialSettingsPage.js @@ -55,7 +55,7 @@ const propTypes = { role: PropTypes.string, /** The current action that is waiting to happen on the policy */ - pendingAction: PropTypes.oneOf(['add', 'update', 'delete']), + pendingAction: PropTypes.oneOf(_.values(CONST.RED_BRICK_ROAD_PENDING_ACTION)), })), /** List of policy members */ From a1e5d386262df4fce294928efe76f00605f23561 Mon Sep 17 00:00:00 2001 From: Puneet Lath Date: Mon, 5 Sep 2022 10:43:46 +0100 Subject: [PATCH 2/3] Remove unnecessary ternary --- src/pages/settings/InitialSettingsPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js index 24e0968b04e3..f23f7b1205a6 100755 --- a/src/pages/settings/InitialSettingsPage.js +++ b/src/pages/settings/InitialSettingsPage.js @@ -173,7 +173,7 @@ class InitialSettingsPage extends React.Component { iconFill: themeColors.iconReversed, fallbackIcon: Expensicons.FallbackWorkspaceAvatar, brickRoadIndicator: PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy, this.props.policyMembers), - pendingAction: policy.pendingAction ? policy.pendingAction : null, + pendingAction: policy.pendingAction, isPolicy: true, })) .value(); From 4a0eb70fc24ec9093d0ba7917a072f0fdd0f0772 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Mon, 5 Sep 2022 12:43:16 +0000 Subject: [PATCH 3/3] Update version to 1.1.97-1 --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index d8da435448fd..ed259183df3c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -155,8 +155,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001019700 - versionName "1.1.97-0" + versionCode 1001019701 + versionName "1.1.97-1" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 5229bcebd5ad..b60e2e18e8ad 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.1.97.0 + 1.1.97.1 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 2a7d99c67b4a..8568f3445b54 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.97.0 + 1.1.97.1 diff --git a/package-lock.json b/package-lock.json index 2a2d2c0e6b82..9ceff082092c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.1.97-0", + "version": "1.1.97-1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.1.97-0", + "version": "1.1.97-1", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 32a8e7f4a8e7..32e588c32a2a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.97-0", + "version": "1.1.97-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.",