From 116dcfb8f525539275b342322c772b132c3a18c3 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 4 Jan 2024 12:44:31 +0000 Subject: [PATCH 1/3] Update version to 1.4.21-5 (cherry picked from commit d5f5856b610cc39d5b5f2b054dab67bb74d66922) --- 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 4c6289456041..7b96e1133366 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -96,8 +96,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001042104 - versionName "1.4.21-4" + versionCode 1001042105 + versionName "1.4.21-5" } flavorDimensions "default" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index ac41382486a5..a8da53ed57a7 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 1.4.21.4 + 1.4.21.5 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index ab58f3c293bd..20c2d8e334bf 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.4.21.4 + 1.4.21.5 diff --git a/package-lock.json b/package-lock.json index 5761f2ae4d1d..ee2a26efcc1e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.4.21-4", + "version": "1.4.21-5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.4.21-4", + "version": "1.4.21-5", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 6d136bd5992a..6f88a2ba2f09 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.4.21-4", + "version": "1.4.21-5", "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 0150b30a70ddd05316f8b6b8ca4ee022cbcf375b Mon Sep 17 00:00:00 2001 From: Jules Date: Thu, 4 Jan 2024 12:41:15 +0000 Subject: [PATCH 2/3] Merge pull request #33943 from Expensify/jules-fixLintError [NO QA] Fix consistent-type-imports lint warning (cherry picked from commit 011e31c11ad25df7927251988621097c8bcef23d) --- src/pages/workspace/invoices/WorkspaceInvoicesPage.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesPage.js b/src/pages/workspace/invoices/WorkspaceInvoicesPage.js index 8bc0c4484100..de46108dd37e 100644 --- a/src/pages/workspace/invoices/WorkspaceInvoicesPage.js +++ b/src/pages/workspace/invoices/WorkspaceInvoicesPage.js @@ -1,8 +1,18 @@ +<<<<<<< HEAD:src/pages/workspace/invoices/WorkspaceInvoicesPage.js import PropTypes from 'prop-types'; import React from 'react'; import withLocalize, {withLocalizePropTypes} from '@components/withLocalize'; import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections'; import CONST from '@src/CONST'; +======= +import type {StackScreenProps} from '@react-navigation/stack'; +import React from 'react'; +import useLocalize from '@hooks/useLocalize'; +import type {SettingsNavigatorParamList} from '@libs/Navigation/types'; +import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections'; +import CONST from '@src/CONST'; +import type SCREENS from '@src/SCREENS'; +>>>>>>> 011e31c (Merge pull request #33943 from Expensify/jules-fixLintError):src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx import WorkspaceInvoicesNoVBAView from './WorkspaceInvoicesNoVBAView'; import WorkspaceInvoicesVBAView from './WorkspaceInvoicesVBAView'; From 663b847319acd2d115db464609d297086f3249e4 Mon Sep 17 00:00:00 2001 From: Jules Rosser Date: Thu, 4 Jan 2024 12:55:22 +0000 Subject: [PATCH 3/3] switch reverted file back to Typescript and fix conflicts --- .../invoices/WorkspaceInvoicesPage.js | 53 ------------------- .../invoices/WorkspaceInvoicesPage.tsx | 35 ++++++++++++ 2 files changed, 35 insertions(+), 53 deletions(-) delete mode 100644 src/pages/workspace/invoices/WorkspaceInvoicesPage.js create mode 100644 src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesPage.js b/src/pages/workspace/invoices/WorkspaceInvoicesPage.js deleted file mode 100644 index de46108dd37e..000000000000 --- a/src/pages/workspace/invoices/WorkspaceInvoicesPage.js +++ /dev/null @@ -1,53 +0,0 @@ -<<<<<<< HEAD:src/pages/workspace/invoices/WorkspaceInvoicesPage.js -import PropTypes from 'prop-types'; -import React from 'react'; -import withLocalize, {withLocalizePropTypes} from '@components/withLocalize'; -import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections'; -import CONST from '@src/CONST'; -======= -import type {StackScreenProps} from '@react-navigation/stack'; -import React from 'react'; -import useLocalize from '@hooks/useLocalize'; -import type {SettingsNavigatorParamList} from '@libs/Navigation/types'; -import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections'; -import CONST from '@src/CONST'; -import type SCREENS from '@src/SCREENS'; ->>>>>>> 011e31c (Merge pull request #33943 from Expensify/jules-fixLintError):src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx -import WorkspaceInvoicesNoVBAView from './WorkspaceInvoicesNoVBAView'; -import WorkspaceInvoicesVBAView from './WorkspaceInvoicesVBAView'; - -const propTypes = { - /** The route object passed to this page from the navigator */ - route: PropTypes.shape({ - /** Each parameter passed via the URL */ - params: PropTypes.shape({ - /** The policyID that is being configured */ - policyID: PropTypes.string.isRequired, - }).isRequired, - }).isRequired, - - ...withLocalizePropTypes, -}; - -function WorkspaceInvoicesPage(props) { - return ( - - {(hasVBA, policyID) => ( - <> - {!hasVBA && } - {hasVBA && } - - )} - - ); -} - -WorkspaceInvoicesPage.propTypes = propTypes; -WorkspaceInvoicesPage.displayName = 'WorkspaceInvoicesPage'; - -export default withLocalize(WorkspaceInvoicesPage); diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx b/src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx new file mode 100644 index 000000000000..2126409231b8 --- /dev/null +++ b/src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx @@ -0,0 +1,35 @@ +import type {StackScreenProps} from '@react-navigation/stack'; +import React from 'react'; +import useLocalize from '@hooks/useLocalize'; +import type {SettingsNavigatorParamList} from '@libs/Navigation/types'; +import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections'; +import CONST from '@src/CONST'; +import type SCREENS from '@src/SCREENS'; +import WorkspaceInvoicesNoVBAView from './WorkspaceInvoicesNoVBAView'; +import WorkspaceInvoicesVBAView from './WorkspaceInvoicesVBAView'; + +type WorkspaceInvoicesPageProps = StackScreenProps; + +function WorkspaceInvoicesPage({route}: WorkspaceInvoicesPageProps) { + const {translate} = useLocalize(); + + return ( + + {(hasVBA: boolean, policyID: string) => ( + <> + {!hasVBA && } + {hasVBA && } + + )} + + ); +} + +WorkspaceInvoicesPage.displayName = 'WorkspaceInvoicesPage'; + +export default WorkspaceInvoicesPage;