Merge remote-tracking branch 'upstream/main' into 44436-qr-code-expand

.github/workflows/platformDeploy.yml

@@ -84,13 +84,15 @@ jobs:
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: bundle exec fastlane android beta
         env:
+          RUBYOPT: '-rostruct'
           MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }}
           MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }}
 
       - name: Run Fastlane production
         if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: bundle exec fastlane android production
         env:
+          RUBYOPT: '-rostruct'
           VERSION: ${{ env.VERSION_CODE }}
 
       - name: Archive Android sourcemaps

.github/workflows/testBuild.yml

@@ -117,6 +117,7 @@ jobs:
         id: runFastlaneBetaTest
         run: bundle exec fastlane android build_internal
         env:
+          RUBYOPT: '-rostruct'
           S3_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
           S3_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           S3_BUCKET: ad-hoc-expensify-cash

android/app/build.gradle

@@ -108,8 +108,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009000603
-        versionName "9.0.6-3"
+        versionCode 1009000704
+        versionName "9.0.7-4"
         // 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"

ios/NewExpensify/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.6</string>
+	<string>9.0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.6.3</string>
+	<string>9.0.7.4</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.6</string>
+	<string>9.0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.6.3</string>
+	<string>9.0.7.4</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.6</string>
+	<string>9.0.7</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.6.3</string>
+	<string>9.0.7.4</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.6-3",
+  "version": "9.0.7-4",
   "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.",

patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch

@@ -2619,6 +2619,25 @@ index 6982220..b515270 100644
 +    readonly eventEmitter: NativeEventEmitter;
  };
  export default _default;
+diff --git a/node_modules/@react-native-community/netinfo/package.json b/node_modules/@react-native-community/netinfo/package.json
+index 3c80db2..15d214d 100644
+--- a/node_modules/@react-native-community/netinfo/package.json
++++ b/node_modules/@react-native-community/netinfo/package.json
+@@ -97,6 +97,14 @@
+     "webpack-cli": "^3.3.10",
+     "webpack-dev-server": "^3.11.3"
+   },
++  "codegenConfig": {
++    "name": "RNCNetInfoSpec",
++    "type": "modules",
++    "jsSrcsDir": "src/internal",
++    "android": {
++      "javaPackageName": "com.reactnativecommunity.netinfo"
++    }
++  },
+   "repository": {
+     "type": "git",
+     "url": "https://github.com/react-native-netinfo/react-native-netinfo.git"
 diff --git a/node_modules/@react-native-community/netinfo/react-native-netinfo.podspec b/node_modules/@react-native-community/netinfo/react-native-netinfo.podspec
 index e34e728..9090eb1 100644
 --- a/node_modules/@react-native-community/netinfo/react-native-netinfo.podspec
@@ -2955,95 +2974,95 @@ index 878f7ba..0000000
 --- a/node_modules/@react-native-community/netinfo/windows/.npmignore
 +++ /dev/null
 @@ -1,92 +0,0 @@
--*AppPackages*
--*BundleArtifacts*
--
--#OS junk files
--[Tt]humbs.db
--*.DS_Store
--
--#Visual Studio files
--*.[Oo]bj
--*.user
--*.aps
--*.pch
--*.vspscc
--*.vssscc
--*_i.c
--*_p.c
--*.ncb
--*.suo
--*.tlb
--*.tlh
--*.bak
--*.[Cc]ache
--*.ilk
--*.log
--*.lib
--*.sbr
--*.sdf
--*.opensdf
--*.opendb
--*.unsuccessfulbuild
--ipch/
--[Oo]bj/
--[Bb]in
--[Dd]ebug*/
--[Rr]elease*/
--Ankh.NoLoad
--
--# Visual C++ cache files
--ipch/
--*.aps
--*.ncb
--*.opendb
--*.opensdf
--*.sdf
--*.cachefile
--*.VC.db
--*.VC.VC.opendb
--
--#MonoDevelop
--*.pidb
--*.userprefs
--
--#Tooling
--_ReSharper*/
--*.resharper
--[Tt]est[Rr]esult*
--*.sass-cache
--
--#Project files
--[Bb]uild/
--
--#Subversion files
--.svn
--
--# Office Temp Files
--~$*
--
--# vim Temp Files
--*~
--
--#NuGet
--packages/
--*.nupkg
--
--#ncrunch
--*ncrunch*
--*crunch*.local.xml
--
--# visual studio database projects
--*.dbmdl
--
--#Test files
--*.testsettings
--
--#Other files
--*.DotSettings
--.vs/
--*project.lock.json
--
--#Files generated by the VS build
--**/Generated Files/**
--
+-*AppPackages*
+-*BundleArtifacts*
+-
+-#OS junk files
+-[Tt]humbs.db
+-*.DS_Store
+-
+-#Visual Studio files
+-*.[Oo]bj
+-*.user
+-*.aps
+-*.pch
+-*.vspscc
+-*.vssscc
+-*_i.c
+-*_p.c
+-*.ncb
+-*.suo
+-*.tlb
+-*.tlh
+-*.bak
+-*.[Cc]ache
+-*.ilk
+-*.log
+-*.lib
+-*.sbr
+-*.sdf
+-*.opensdf
+-*.opendb
+-*.unsuccessfulbuild
+-ipch/
+-[Oo]bj/
+-[Bb]in
+-[Dd]ebug*/
+-[Rr]elease*/
+-Ankh.NoLoad
+-
+-# Visual C++ cache files
+-ipch/
+-*.aps
+-*.ncb
+-*.opendb
+-*.opensdf
+-*.sdf
+-*.cachefile
+-*.VC.db
+-*.VC.VC.opendb
+-
+-#MonoDevelop
+-*.pidb
+-*.userprefs
+-
+-#Tooling
+-_ReSharper*/
+-*.resharper
+-[Tt]est[Rr]esult*
+-*.sass-cache
+-
+-#Project files
+-[Bb]uild/
+-
+-#Subversion files
+-.svn
+-
+-# Office Temp Files
+-~$*
+-
+-# vim Temp Files
+-*~
+-
+-#NuGet
+-packages/
+-*.nupkg
+-
+-#ncrunch
+-*ncrunch*
+-*crunch*.local.xml
+-
+-# visual studio database projects
+-*.dbmdl
+-
+-#Test files
+-*.testsettings
+-
+-#Other files
+-*.DotSettings
+-.vs/
+-*project.lock.json
+-
+-#Files generated by the VS build
+-**/Generated Files/**
+-

src/CONST.ts

@@ -1205,6 +1205,8 @@ const CONST = {
         NOTE: 'n',
     },
 
+    IMAGE_HIGH_RESOLUTION_THRESHOLD: 7000,
+
     IMAGE_OBJECT_POSITION: {
         TOP: 'top',
         INITIAL: 'initial',
@@ -1381,6 +1383,7 @@ const CONST = {
         SYNC: 'sync',
         SYNC_REIMBURSED_REPORTS: 'syncReimbursedReports',
         REIMBURSEMENT_ACCOUNT_ID: 'reimbursementAccountID',
+        ENTITY: 'entity',
     },
 
     SAGE_INTACCT: {
@@ -2394,7 +2397,7 @@ const CONST = {
             this.ACCOUNT_ID.REWARDS,
             this.ACCOUNT_ID.STUDENT_AMBASSADOR,
             this.ACCOUNT_ID.SVFG,
-        ];
+        ].filter((id) => id !== -1);
     },
 
     // Emails that profile view is prohibited
@@ -4012,6 +4015,15 @@ const CONST = {
         WARNING: 'warning',
     },
 
+    /**
+     * Constants with different types for the modifiedAmount violation
+     */
+    MODIFIED_AMOUNT_VIOLATION_DATA: {
+        DISTANCE: 'distance',
+        CARD: 'card',
+        SMARTSCAN: 'smartscan',
+    },
+
     /**
      * Constants for types of violation names.
      * Defined here because they need to be referenced by the type system to generate the

src/ROUTES.ts

@@ -847,6 +847,10 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/expensify-card',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/expensify-card` as const,
     },
+    WORKSPACE_EXPENSIFY_CARD_DETAILS: {
+        route: 'settings/workspaces/:policyID/expensify-card/:cardID',
+        getRoute: (policyID: string, cardID: string, backTo?: string) => getUrlWithBackToParam(`settings/workspaces/${policyID}/expensify-card/${cardID}`, backTo),
+    },
     WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW: {
         route: 'settings/workspaces/:policyID/expensify-card/issue-new',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/expensify-card/issue-new` as const,
@@ -1175,6 +1179,10 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/accounting/sage-intacct/existing-connections',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/existing-connections` as const,
     },
+    POLICY_ACCOUNTING_SAGE_INTACCT_ENTITY: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/entity',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/entity` as const,
+    },
     POLICY_ACCOUNTING_SAGE_INTACCT_IMPORT: {
         route: 'settings/workspaces/:policyID/accounting/sage-intacct/import',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/import` as const,

src/SCREENS.ts

@@ -315,6 +315,7 @@ const SCREENS = {
             SAGE_INTACCT_PREREQUISITES: 'Policy_Accounting_Sage_Intacct_Prerequisites',
             ENTER_SAGE_INTACCT_CREDENTIALS: 'Policy_Enter_Sage_Intacct_Credentials',
             EXISTING_SAGE_INTACCT_CONNECTIONS: 'Policy_Existing_Sage_Intacct_Connections',
+            SAGE_INTACCT_ENTITY: 'Policy_Sage_Intacct_Entity',
             SAGE_INTACCT_IMPORT: 'Policy_Accounting_Sage_Intacct_Import',
             SAGE_INTACCT_TOGGLE_MAPPING: 'Policy_Accounting_Sage_Intacct_Toggle_Mapping',
             SAGE_INTACCT_MAPPING_TYPE: 'Policy_Accounting_Sage_Intacct_Mapping_Type',
@@ -341,6 +342,7 @@ const SCREENS = {
         RATE_AND_UNIT_RATE: 'Workspace_RateAndUnit_Rate',
         RATE_AND_UNIT_UNIT: 'Workspace_RateAndUnit_Unit',
         EXPENSIFY_CARD: 'Workspace_ExpensifyCard',
+        EXPENSIFY_CARD_DETAILS: 'Workspace_ExpensifyCard_Details',
         EXPENSIFY_CARD_ISSUE_NEW: 'Workspace_ExpensifyCard_New',
         EXPENSIFY_CARD_BANK_ACCOUNT: 'Workspace_ExpensifyCard_BankAccount',
         BILLS: 'Workspace_Bills',