Merge branch 'main' into fix/42194-dont-disable-deleted-parent-action…

…-while-offline

.env.example

@@ -11,7 +11,6 @@ USE_WEB_PROXY=false
 USE_WDYR=false
 CAPTURE_METRICS=false
 ONYX_METRICS=false
-GOOGLE_GEOLOCATION_API_KEY=AIzaSyBqg6bMvQU7cPWDKhhzpYqJrTEnSorpiLI
 
 EXPENSIFY_ACCOUNT_ID_ACCOUNTING=-1
 EXPENSIFY_ACCOUNT_ID_ADMIN=-1

.env.production

@@ -7,4 +7,3 @@ PUSHER_APP_KEY=268df511a204fbb60884
 USE_WEB_PROXY=false
 ENVIRONMENT=production
 SEND_CRASH_REPORTS=true
-GOOGLE_GEOLOCATION_API_KEY=AIzaSyBFKujMpzExz0_z2pAGfPUwkmlaUc-uw1Q

.env.staging

@@ -6,5 +6,4 @@ EXPENSIFY_PARTNER_PASSWORD=e21965746fd75f82bb66
 PUSHER_APP_KEY=268df511a204fbb60884
 USE_WEB_PROXY=false
 ENVIRONMENT=staging
-SEND_CRASH_REPORTS=true
-GOOGLE_GEOLOCATION_API_KEY=AIzaSyD2T1mlByThbUN88O8OPOD8vKuMMwLD4-M
+SEND_CRASH_REPORTS=true

.eslintrc.js

@@ -235,8 +235,21 @@ module.exports = {
         ],
     },
 
-    // Remove once no JS files are left
     overrides: [
+        // Enforces every Onyx type and its properties to have a comment explaining its purpose.
+        {
+            files: ['src/types/onyx/**/*.ts'],
+            rules: {
+                'jsdoc/require-jsdoc': [
+                    'error',
+                    {
+                        contexts: ['TSInterfaceDeclaration', 'TSTypeAliasDeclaration', 'TSPropertySignature'],
+                    },
+                ],
+            },
+        },
+
+        // Remove once no JS files are left
         {
             files: ['*.js', '*.jsx'],
             rules: {

.github/scripts/printPodspec.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+
+# This file is a lightweight port of the `pod ipc spec` command.
+# It was built from scratch to imports some 3rd party functions before reading podspecs
+
+require 'cocoapods'
+require 'json'
+
+# Require 3rd party functions needed to parse podspecs. This code is copied from ios/Podfile
+def node_require(script)
+  # Resolve script with node to allow for hoisting
+  require Pod::Executable.execute_command('node', ['-p',
+    "require.resolve(
+      '#{script}',
+      {paths: [process.argv[1]]},
+    )", __dir__]).strip
+end
+node_require('react-native/scripts/react_native_pods.rb')
+node_require('react-native-permissions/scripts/setup.rb')
+
+# Configure pod in silent mode
+Pod::Config.instance.silent = true
+
+# Process command-line arguments
+podspec_files = ARGV
+
+# Validate each podspec file
+podspec_files.each do |podspec_file|
+  begin
+    spec = Pod::Specification.from_file(podspec_file)
+    puts(spec.to_pretty_json)
+  rescue => e
+    STDERR.puts "Failed to validate #{podspec_file}: #{e.message}"
+  end
+end

.github/scripts/verifyPodfile.sh

@@ -8,15 +8,20 @@ source scripts/shellUtils.sh
 
 title "Verifying that Podfile.lock is synced with the project"
 
-declare EXIT_CODE=0
+# Cleanup and exit
+# param - status code
+function cleanupAndExit {
+  cd "$START_DIR" || exit 1
+  exit "$1"
+}
 
 # Check Provisioning Style. If automatic signing is enabled, iOS builds will fail, so ensure we always have the proper profile specified
 info "Verifying that automatic signing is not enabled"
 if grep -q 'PROVISIONING_PROFILE_SPECIFIER = "(NewApp) AppStore"' ios/NewExpensify.xcodeproj/project.pbxproj; then
   success "Automatic signing not enabled"
 else
   error "Error: Automatic provisioning style is not allowed!"
-  EXIT_CODE=1
+  cleanupAndExit 1
 fi
 
 PODFILE_SHA=$(openssl sha1 ios/Podfile | awk '{print $2}')
@@ -29,7 +34,7 @@ if [[ "$PODFILE_SHA" == "$PODFILE_LOCK_SHA" ]]; then
   success "Podfile checksum verified!"
 else
   error "Podfile.lock checksum mismatch. Did you forget to run \`npx pod-install\`?"
-  EXIT_CODE=1
+  cleanupAndExit 1
 fi
 
 info "Ensuring correct version of cocoapods is used..."
@@ -45,45 +50,46 @@ if [[ "$POD_VERSION_FROM_GEMFILE" == "$POD_VERSION_FROM_PODFILE_LOCK" ]]; then
   success "Cocoapods version from Podfile.lock matches cocoapods version from Gemfile"
 else
   error "Cocoapods version from Podfile.lock does not match cocoapods version from Gemfile. Please use \`npm run pod-install\` or \`bundle exec pod install\` instead of \`pod install\` to install pods."
-  EXIT_CODE=1
+  cleanupAndExit 1
 fi
 
 info "Comparing Podfile.lock with node packages..."
 
 # Retrieve a list of podspec directories as listed in the Podfile.lock
-SPEC_DIRS=$(yq '.["EXTERNAL SOURCES"].[].":path" | select( . == "*node_modules*")' < ios/Podfile.lock)
+if ! SPEC_DIRS=$(yq '.["EXTERNAL SOURCES"].[].":path" | select( . == "*node_modules*")' < ios/Podfile.lock); then
+  error "Error: Could not parse podspec directories from Podfile.lock"
+  cleanupAndExit 1
+fi
+
+if ! read_lines_into_array PODSPEC_PATHS < <(npx react-native config | jq --raw-output '.dependencies[].platforms.ios.podspecPath | select ( . != null)'); then
+  error "Error: could not parse podspec paths from react-native config command"
+  cleanupAndExit 1
+fi
 
 # Format a list of Pods based on the output of the config command
-FORMATTED_PODS=$( \
-  jq --raw-output --slurp 'map((.name + " (" + .version + ")")) | .[]' <<< "$( \
-    npx react-native config | \
-    jq '.dependencies[].platforms.ios.podspecPath | select( . != null )' | \
-    xargs -L 1 pod ipc spec --silent
-  )"
-)
+if ! FORMATTED_PODS=$( \
+  jq --raw-output --slurp 'map((.name + " (" + .version + ")")) | .[]' <<< "$(./.github/scripts/printPodspec.rb "${PODSPEC_PATHS[@]}")" \
+); then
+  error "Error: could not parse podspecs at paths parsed from react-native config"
+  cleanupAndExit 1
+fi
 
 # Check for uncommitted package removals
 # If they are listed in Podfile.lock but the directories don't exist they have been removed
 while read -r DIR; do
   if [[ ! -d "${DIR#../}" ]]; then
     error "Directory \`${DIR#../node_modules/}\` not found in node_modules. Did you forget to run \`npx pod-install\` after removing the package?"
-    EXIT_CODE=1
+    cleanupAndExit 1
   fi
 done <<< "$SPEC_DIRS"
 
 # Check for uncommitted package additions/updates
 while read -r POD; do
   if ! grep -q "$POD" ./ios/Podfile.lock; then
     error "$POD not found in Podfile.lock. Did you forget to run \`npx pod-install\`?"
-    EXIT_CODE=1
+    cleanupAndExit 1
   fi
 done <<< "$FORMATTED_PODS"
 
-if [[ "$EXIT_CODE" == 0 ]]; then
-  success "Podfile.lock is up to date."
-fi
-
-# Cleanup
-cd "$START_DIR" || exit 1
-
-exit $EXIT_CODE
+success "Podfile.lock is up to date."
+cleanupAndExit 0

.github/workflows/platformDeploy.yml

@@ -366,6 +366,17 @@ jobs:
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
 
+  # Build a version of iOS and Android HybridApp if we are deploying to staging
+  hybridApp:
+    runs-on: ubuntu-latest
+    needs: validateActor
+    if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) && github.event_name == 'push' }}
+    steps:
+      - name: 'Deploy HybridApp'
+        run: gh workflow run --repo Expensify/Mobile-Deploy deploy.yml -f force_build=true
+        env:
+            GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+
   postSlackMessageOnSuccess:
     name: Post a Slack message when all platforms deploy successfully
     runs-on: ubuntu-latest

.gitignore

@@ -37,6 +37,11 @@ local.properties
 android/app/src/main/java/com/expensify/chat/generated/
 .cxx/
 
+# VIM
+*.swp
+*.swo
+*~
+
 # Vscode
 .vscode
 

.nvmrc

@@ -1 +1 @@
-20.13.0
+20.14.0

README.md

@@ -663,7 +663,38 @@ Sometimes it might be beneficial to generate a local production version instead
 In order to generate a production web build, run `npm run build`, this will generate a production javascript build in the `dist/` folder.
 
 #### Local production build of the MacOS desktop app
-In order to compile a production desktop build, run `npm run desktop-build`, this will generate a production app in the `dist/Mac` folder named `Chat.app`.
+The commands used to compile a production or staging desktop build are `npm run desktop-build` and `npm run desktop-build-staging`, respectively. These will product an app in the `dist/Mac` folder named NewExpensify.dmg that you can install like a normal app.
+
+HOWEVER, by default those commands will try to notarize the build (signing it as Expensify) and publish it to the S3 bucket where it's hosted for users. In most cases you won't actually need or want to do that for your local testing. To get around that and disable those behaviors for your local build, apply the following diff:
+
+```diff
+diff --git a/config/electronBuilder.config.js b/config/electronBuilder.config.js
+index e4ed685f65..4c7c1b3667 100644
+--- a/config/electronBuilder.config.js
++++ b/config/electronBuilder.config.js
+@@ -42,9 +42,6 @@ module.exports = {
+         entitlements: 'desktop/entitlements.mac.plist',
+         entitlementsInherit: 'desktop/entitlements.mac.plist',
+         type: 'distribution',
+-        notarize: {
+-            teamId: '368M544MTT',
+-        },
+     },
+     dmg: {
+         title: 'New Expensify',
+diff --git a/scripts/build-desktop.sh b/scripts/build-desktop.sh
+index 791f59d733..526306eec1 100755
+--- a/scripts/build-desktop.sh
++++ b/scripts/build-desktop.sh
+@@ -35,4 +35,4 @@ npx webpack --config config/webpack/webpack.desktop.ts --env file=$ENV_FILE
+ title "Building Desktop App Archive Using Electron"
+ info ""
+ shift 1
+-npx electron-builder --config config/electronBuilder.config.js --publish always "$@"
++npx electron-builder --config config/electronBuilder.config.js --publish never "$@"
+```
+
+There may be some cases where you need to test a signed and published build, such as when testing the update flows. Instructions on setting that up can be found in [Testing Electron Auto-Update](https://github.com/Expensify/App/blob/main/desktop/README.md#testing-electron-auto-update). Good luck 🙃
 
 #### Local production build the iOS app
 In order to compile a production iOS build, run `npm run ios-build`, this will generate a `Chat.ipa` in the root directory of this project.

__mocks__/react-native-permissions.ts

@@ -35,30 +35,30 @@ const requestNotifications: jest.Mock<Notification> = jest.fn((options: Record<s
     status: RESULTS.GRANTED,
     settings: Object.keys(options)
         .filter((option: string) => notificationOptions.includes(option))
-        .reduce((acc: NotificationSettings, option: string) => ({...acc, [option]: true}), {
-            lockScreen: true,
-            notificationCenter: true,
-        }),
+        .reduce(
+            (acc: NotificationSettings, option: string) => {
+                acc[option] = true;
+                return acc;
+            },
+            {
+                lockScreen: true,
+                notificationCenter: true,
+            },
+        ),
 }));
 
 const checkMultiple: jest.Mock<ResultsCollection> = jest.fn((permissions: string[]) =>
-    permissions.reduce(
-        (acc: ResultsCollection, permission: string) => ({
-            ...acc,
-            [permission]: RESULTS.GRANTED,
-        }),
-        {},
-    ),
+    permissions.reduce((acc: ResultsCollection, permission: string) => {
+        acc[permission] = RESULTS.GRANTED;
+        return acc;
+    }, {}),
 );
 
 const requestMultiple: jest.Mock<ResultsCollection> = jest.fn((permissions: string[]) =>
-    permissions.reduce(
-        (acc: ResultsCollection, permission: string) => ({
-            ...acc,
-            [permission]: RESULTS.GRANTED,
-        }),
-        {},
-    ),
+    permissions.reduce((acc: ResultsCollection, permission: string) => {
+        acc[permission] = RESULTS.GRANTED;
+        return acc;
+    }, {}),
 );
 
 export {

android/app/build.gradle

@@ -107,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001047705
-        versionName "1.4.77-5"
+        versionCode 1001048108
+        versionName "1.4.81-8"
         // 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"