Merge branch 'main' into fix_80603

Author: etCoderDysto

.github/workflows/generateTranslations.yml

@@ -141,6 +141,7 @@ jobs:
           EOF
           )"
           readonly PARROT_FOOTER
+          readonly WORKFLOW_RUN_LINK="[View workflow run](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})"
 
           if [ "$PATCH_SIZE" -le "$MAX_COMMENT_SIZE" ]; then
             # Small diff - include in comment
@@ -159,6 +160,8 @@ jobs:
               echo '</details>'
               echo
               echo "$PARROT_FOOTER 😉"
+              echo
+              echo "${WORKFLOW_RUN_LINK}"
             } > "$TEMP_COMMENT_FILE"
           else
             # Large diff - upload as gist and link
@@ -176,6 +179,8 @@ jobs:
               echo "📋 **[View the translation diff here](${GIST_URL})** 📋"
               echo
               echo "$PARROT_FOOTER_WITH_CMD 😉"
+              echo
+              echo "${WORKFLOW_RUN_LINK}"
             } > "$TEMP_COMMENT_FILE"
           fi
 

.github/workflows/preDeploy.yml

@@ -58,7 +58,12 @@ jobs:
 
       - name: Check if merged pull request should trigger a deploy
         id: shouldDeploy
-        run: echo "SHOULD_DEPLOY=${{ (!fromJSON(steps.isStagingDeployLocked.outputs.IS_LOCKED) && github.actor != 'OSBotify') }}" >> "$GITHUB_OUTPUT"
+        run: |
+          if gh api /orgs/Expensify/teams/mobile-deployers/memberships/${{ github.actor }} --silent; then
+            echo "SHOULD_DEPLOY=${{ (!fromJSON(steps.isStagingDeployLocked.outputs.IS_LOCKED) && github.actor != 'OSBotify') }}" >> "$GITHUB_OUTPUT"
+          else
+            echo "SHOULD_DEPLOY=false" >> "$GITHUB_OUTPUT"
+          fi
 
   skipDeploy:
     runs-on: ubuntu-latest

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009031101
-        versionName "9.3.11-1"
+        versionCode 1009031117
+        versionName "9.3.11-17"
         // 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"

android/app/build.gradle

@@ -47,4 +47,7 @@
 -dontwarn org.jmrtd.protocol.BACResult
 -dontwarn org.jmrtd.protocol.PACEResult
 -dontwarn org.spongycastle.jce.provider.BouncyCastleProvider
--dontwarn org.slf4j.impl.StaticLoggerBinder
+-dontwarn org.slf4j.impl.StaticLoggerBinder
+
+# https://shopify.github.io/react-native-skia/docs/getting-started/installation/#proguard
+-keep class com.shopify.reactnative.skia.** { *; }

android/app/proguard-rules.pro

@@ -42,7 +42,7 @@ class MainApplication : MultiDexApplication(), ReactApplication {
             add(NavBarManagerPackage())
         }
 
-        override fun getJSMainModuleName() = "index"
+        override fun getJSMainModuleName() = ".expo/.virtual-metro-entry"
 
         override val isNewArchEnabled: Boolean
             get() = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED

android/app/src/main/java/com/expensify/chat/MainApplication.kt

@@ -65,7 +65,7 @@ const webpack = {
 };
 
 const metro = {
-    presets: [[require('@react-native/babel-preset'), {disableImportExportTransform: true}]],
+    presets: [require('@react-native/babel-preset')],
     plugins: [
         ['babel-plugin-react-compiler', ReactCompilerConfig], // must run first!
 
@@ -177,13 +177,5 @@ module.exports = (api) => {
     const runningIn = api.caller((args = {}) => args.name);
     console.debug('  - running in: ', runningIn);
 
-    const isJest = runningIn === 'babel-jest';
-    if (isJest) {
-        return {
-            ...metro,
-            presets: [[require('@react-native/babel-preset'), {disableImportExportTransform: false}]],
-        };
-    }
-
     return ['metro', 'babel-jest'].includes(runningIn) ? metro : webpack;
 };

assets/images/home-testdrive-image.png

@@ -59,6 +59,8 @@ const includeModules = [
     'expo-video',
     'expo-image-manipulator',
     'expo-modules-core',
+    'victory-native',
+    '@shopify/react-native-skia',
 ].join('|');
 
 const environmentToLogoSuffixMap: Record<string, string> = {
@@ -158,6 +160,9 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
 
                     // Group‑IB web SDK injection file
                     {from: 'web/snippets/gib.js', to: 'gib.js'},
+
+                    // CanvasKit WASM files for @shopify/react-native-skia web support (uses full version)
+                    {from: 'node_modules/canvaskit-wasm/bin/full/canvaskit.wasm'},
                 ],
             }),
             new webpack.EnvironmentPlugin({JEST_WORKER_ID: ''}),
@@ -236,7 +241,7 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
                      * You can remove something from this list if it doesn't use "react-native" as an import and it doesn't
                      * use JSX/JS that needs to be transformed by babel.
                      */
-                    exclude: [new RegExp(`node_modules/(?!(${includeModules})/).*|.native.js$`)],
+                    exclude: [new RegExp(`node_modules/(?!(${includeModules})/).*|\\.native\\.(js|jsx|ts|tsx)$`)],
                 },
                 // We are importing this worker as a string by using asset/source otherwise it will default to loading via an HTTPS request later.
                 // This causes issues if we have gone offline before the pdfjs web worker is set up as we won't be able to load it from the server.
@@ -307,6 +312,10 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
                 lodash: 'lodash-es',
                 'react-native-config': 'react-web-config',
                 'react-native$': 'react-native-web',
+                // Use victory-native source files instead of pre-compiled dist (which uses CommonJS exports)
+                'victory-native': path.resolve(dirname, '../../node_modules/victory-native/src/index.ts'),
+                // Required for @shopify/react-native-skia web support
+                'react-native/Libraries/Image/AssetRegistry': false,
                 // Module alias for web
                 // https://webpack.js.org/configuration/resolve/#resolvealias
                 '@assets': path.resolve(dirname, '../../assets'),
@@ -330,6 +339,8 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
             fallback: {
                 'process/browser': require.resolve('process/browser'),
                 crypto: false,
+                fs: false,
+                path: false,
             },
         },