Merge branch 'main' into francois-beta-help-side-panel

Author: pecanoro

.github/actions/javascript/authorChecklist/index.js

@@ -3481,7 +3481,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.PLIST_PATH_TEST = exports.PLIST_PATH = exports.BUILD_GRADLE_PATH = exports.generateAndroidVersionCode = exports.updateAndroidVersion = exports.updateiOSVersion = void 0;
+exports.PLIST_PATH = exports.BUILD_GRADLE_PATH = exports.generateAndroidVersionCode = exports.updateAndroidVersion = exports.updateiOSVersion = void 0;
 const child_process_1 = __nccwpck_require__(2081);
 const fs_1 = __nccwpck_require__(7147);
 const path_1 = __importDefault(__nccwpck_require__(1017));
@@ -3494,8 +3494,6 @@ const BUILD_GRADLE_PATH = process.env.NODE_ENV === 'test' ? path_1.default.resol
 exports.BUILD_GRADLE_PATH = BUILD_GRADLE_PATH;
 const PLIST_PATH = './ios/NewExpensify/Info.plist';
 exports.PLIST_PATH = PLIST_PATH;
-const PLIST_PATH_TEST = './ios/NewExpensifyTests/Info.plist';
-exports.PLIST_PATH_TEST = PLIST_PATH_TEST;
 const PLIST_PATH_NSE = './ios/NotificationServiceExtension/Info.plist';
 /**
  * Pad a number to be two digits (with leading zeros if necessary).
@@ -3541,10 +3539,8 @@ function updateiOSVersion(version) {
     console.log('Updating iOS', `CFBundleShortVersionString: ${shortVersion}`, `CFBundleVersion: ${cfVersion}`);
     // Update Plists
     (0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH}`);
-    (0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_TEST}`);
     (0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_NSE}`);
     (0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH}`);
-    (0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_TEST}`);
     (0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_NSE}`);
     // Return the cfVersion so we can set the NEW_IOS_VERSION in ios.yml
     return cfVersion;

.github/actions/javascript/bumpVersion/index.js

@@ -10,7 +10,6 @@ import getBuildVersion from 'semver/functions/prerelease';
 // Filepath constants
 const BUILD_GRADLE_PATH = process.env.NODE_ENV === 'test' ? path.resolve(__dirname, '../../android/app/build.gradle') : './android/app/build.gradle';
 const PLIST_PATH = './ios/NewExpensify/Info.plist';
-const PLIST_PATH_TEST = './ios/NewExpensifyTests/Info.plist';
 const PLIST_PATH_NSE = './ios/NotificationServiceExtension/Info.plist';
 
 /**
@@ -65,14 +64,12 @@ function updateiOSVersion(version: string): string {
 
     // Update Plists
     execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH}`);
-    execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_TEST}`);
     execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_NSE}`);
     execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH}`);
-    execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_TEST}`);
     execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_NSE}`);
 
     // Return the cfVersion so we can set the NEW_IOS_VERSION in ios.yml
     return cfVersion;
 }
 
-export {updateiOSVersion, updateAndroidVersion, generateAndroidVersionCode, BUILD_GRADLE_PATH, PLIST_PATH, PLIST_PATH_TEST};
+export {updateiOSVersion, updateAndroidVersion, generateAndroidVersionCode, BUILD_GRADLE_PATH, PLIST_PATH};

.github/libs/nativeVersionUpdater.ts

@@ -143,7 +143,6 @@ jobs:
             ./package-lock.json \
             ./android/app/build.gradle \
             ./ios/NewExpensify/Info.plist \
-            ./ios/NewExpensifyTests/Info.plist \
             ./ios/NotificationServiceExtension/Info.plist
           git commit -m "Update version to ${{ steps.bumpVersion.outputs.NEW_VERSION }}"
 

.github/workflows/createNewVersion.yml

@@ -6,6 +6,7 @@ on:
 
 env:
   SHOULD_DEPLOY_PRODUCTION: ${{ github.ref == 'refs/heads/production' }}
+  IS_APP_REPO: ${{ github.repository == 'Expensify/App' }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -185,12 +186,14 @@ jobs:
           ANDROID_UPLOAD_KEYSTORE_PASSWORD: ${{ steps.load-credentials.outputs.ANDROID_UPLOAD_KEYSTORE_PASSWORD }}
           ANDROID_UPLOAD_KEYSTORE_ALIAS: ${{ steps.load-credentials.outputs.ANDROID_UPLOAD_KEYSTORE_ALIAS }}
           ANDROID_UPLOAD_KEY_PASSWORD: ${{ steps.load-credentials.outputs.ANDROID_UPLOAD_KEY_PASSWORD }}
+          ANDROID_BUILD_TYPE: ${{ vars.ANDROID_BUILD_TYPE }}
 
       - name: Upload Android app to Google Play
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: bundle exec fastlane android upload_google_play_internal_hybrid
+        run: bundle exec fastlane android ${{ vars.ANDROID_UPLOAD_COMMAND }}
         env:
           VERSION: ${{ steps.getAndroidVersion.outputs.VERSION_CODE }}
+          ANDROID_PACKAGE_NAME: ${{ vars.ANDROID_PACKAGE_NAME }}
 
       - name: Get current Android rollout percentage
         if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
@@ -217,7 +220,7 @@ jobs:
           VERSION: ${{ steps.getAndroidVersion.outputs.VERSION_CODE }}
 
       - name: Upload Android build to Browser Stack
-        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        if: ${{ fromJSON(env.IS_APP_REPO) && !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: curl -u "$BROWSERSTACK" -X POST "https://api-cloud.browserstack.com/app-live/upload" -F "file=@${{ env.aabPath }}"
         env:
           BROWSERSTACK: ${{ secrets.BROWSERSTACK }}
@@ -401,6 +404,10 @@ jobs:
           APPLE_DEMO_EMAIL: ${{ secrets.APPLE_DEMO_EMAIL }}
           APPLE_DEMO_PASSWORD: ${{ secrets.APPLE_DEMO_PASSWORD }}
 
+      - name: Upload DSYMs to Firebase
+        if: ${{ fromJSON(env.IS_APP_REPO) && !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        run: bundle exec fastlane ios upload_dsyms
+
       - name: Upload iOS build to Browser Stack
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: curl -u "$BROWSERSTACK" -X POST "https://api-cloud.browserstack.com/app-live/upload" -F "file=@/Users/runner/work/App/App/New Expensify.ipa"
@@ -503,9 +510,9 @@ jobs:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
         run: |
           op read "op://${{ vars.OP_VAULT }}/firebase.json/firebase.json" --force --out-file ./firebase.json
-          op read "op://${{ vars.OP_VAULT }}/OldApp_AppStore/OldApp_AppStore.mobileprovision" --force --out-file ./OldApp_AppStore.mobileprovision
-          op read "op://${{ vars.OP_VAULT }}/OldApp_AppStore_Share_Extension/OldApp_AppStore_Share_Extension.mobileprovision" --force --out-file ./OldApp_AppStore_Share_Extension.mobileprovision
-          op read "op://${{ vars.OP_VAULT }}/OldApp_AppStore_Notification_Service/OldApp_AppStore_Notification_Service.mobileprovision" --force --out-file ./OldApp_AppStore_Notification_Service.mobileprovision
+          op read "op://${{ vars.OP_VAULT }}/OldApp_AppStore/${{ vars.APPLE_STORE_PROVISIONING_PROFILE_FILE }}" --force --out-file ./${{ vars.APPLE_STORE_PROVISIONING_PROFILE_FILE }}
+          op read "op://${{ vars.OP_VAULT }}/OldApp_AppStore_Share_Extension/${{ vars.APPLE_SHARE_PROVISIONING_PROFILE_FILE }}" --force --out-file ./${{ vars.APPLE_SHARE_PROVISIONING_PROFILE_FILE }}
+          op read "op://${{ vars.OP_VAULT }}/OldApp_AppStore_Notification_Service/${{ vars.APPLE_NOTIFICATION_PROVISIONING_PROFILE_FILE }}" --force --out-file ./${{ vars.APPLE_NOTIFICATION_PROVISIONING_PROFILE_FILE }}
           op read "op://${{ vars.OP_VAULT }}/ios-fastlane-json-key.json/ios-fastlane-json-key.json" --force --out-file ./ios-fastlane-json-key.json
           op read "op://${{ vars.OP_VAULT }}/New Expensify Distribution Certificate/Certificates.p12" --force --out-file ./Certificates.p12
 
@@ -519,6 +526,14 @@ jobs:
       - name: Build iOS HybridApp
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: bundle exec fastlane ios build_hybrid
+        env:
+          APPLE_ID: ${{ vars.APPLE_ID }}
+          APPLE_STORE_PROVISIONING_PROFILE_FILE: ${{ vars.APPLE_STORE_PROVISIONING_PROFILE_FILE }}
+          APPLE_STORE_PROVISIONING_PROFILE_NAME: ${{ vars.APPLE_STORE_PROVISIONING_PROFILE_NAME }}
+          APPLE_SHARE_PROVISIONING_PROFILE_FILE: ${{ vars.APPLE_SHARE_PROVISIONING_PROFILE_FILE }}
+          APPLE_SHARE_PROVISIONING_PROFILE_NAME: ${{ vars.APPLE_SHARE_PROVISIONING_PROFILE_NAME }}
+          APPLE_NOTIFICATION_PROVISIONING_PROFILE_FILE: ${{ vars.APPLE_NOTIFICATION_PROVISIONING_PROFILE_FILE }}
+          APPLE_NOTIFICATION_PROVISIONING_PROFILE_NAME: ${{ vars.APPLE_NOTIFICATION_PROVISIONING_PROFILE_NAME }}
 
       - name: Upload release build to TestFlight
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
@@ -528,6 +543,11 @@ jobs:
           APPLE_CONTACT_PHONE: ${{ secrets.APPLE_CONTACT_PHONE }}
           APPLE_DEMO_EMAIL: ${{ secrets.APPLE_DEMO_EMAIL }}
           APPLE_DEMO_PASSWORD: ${{ secrets.APPLE_DEMO_PASSWORD }}
+          APPLE_ID: ${{ vars.APPLE_ID }}
+
+      - name: Upload DSYMs to Firebase for HybridApp
+        if: ${{ fromJSON(env.IS_APP_REPO) && !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        run: bundle exec fastlane ios upload_dsyms_hybrid
 
       - name: Submit production build for App Store review and a slow rollout
         if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
@@ -539,9 +559,10 @@ jobs:
           bundle exec fastlane ios submit_hybrid_for_rollout
         env:
           VERSION: ${{ steps.getIOSVersion.outputs.IOS_VERSION }}
+          APPLE_ID: ${{ vars.APPLE_ID }}
 
       - name: Upload iOS build to Browser Stack
-        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        if: ${{ fromJSON(env.IS_APP_REPO) && !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: curl -u "$BROWSERSTACK" -X POST "https://api-cloud.browserstack.com/app-live/upload" -F "file=@${{ env.ipaPath }}"
         env:
           BROWSERSTACK: ${{ secrets.BROWSERSTACK }}

.github/workflows/deploy.yml

@@ -471,6 +471,7 @@ You can only build HybridApp if you have been granted access to [`Mobile-Expensi
         ignore = all
     ```
     This ensures that submodule changes are ignored unless you deliberately update them.
+3. Run `git config --global submodule.recurse true` in order to have the submodule updated when you pull App
 
 
 > [!Note]  

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009011509
-        versionName "9.1.15-9"
+        versionCode 1009011802
+        versionName "9.1.18-2"
         // 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"

README.md

@@ -104,6 +104,52 @@
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/track-expense"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/submit-expense"/>
             </intent-filter>
+             <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <!-- Images -->
+                <data android:mimeType="image/jpg" />
+                <data android:mimeType="image/jpeg" />
+                <data android:mimeType="image/gif" />
+                <data android:mimeType="image/png" />
+                <data android:mimeType="image/tif" />
+                <data android:mimeType="image/tiff" />
+
+                <!-- Documents -->
+                <data android:mimeType="application/pdf" />
+                <data android:mimeType="application/msword" />
+                <data android:mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.document" />
+                <data android:mimeType="application/rtf" />
+                <data android:mimeType="application/zip" />
+                <data android:mimeType="message/rfc822" />
+
+                <!-- Text / HTML -->
+                <data android:mimeType="text/plain" />
+                <data android:mimeType="text/html" />
+                <data android:mimeType="text/xml" />
+
+                <!-- Audio / Video -->
+                <data android:mimeType="audio/mpeg" />
+                <data android:mimeType="audio/aac" />
+                <data android:mimeType="audio/flac" />
+                <data android:mimeType="audio/wav" />
+                <data android:mimeType="audio/x-wav" />
+                <data android:mimeType="audio/mp3" />
+                <data android:mimeType="audio/vorbis" />
+                <data android:mimeType="audio/x-vorbis" />
+                <data android:mimeType="audio/opus" />
+
+                <data android:mimeType="video/mp4" />
+                <data android:mimeType="video/mp2t" />
+                <data android:mimeType="video/webm" />
+                <data android:mimeType="video/avc" />
+                <data android:mimeType="video/hevc" />
+                <data android:mimeType="video/x-vnd.on2.vp8" />
+                <data android:mimeType="video/x-vnd.on2.vp9" />
+                <data android:mimeType="video/av01" />
+
+            </intent-filter>
         </activity>
 
         <meta-data

android/app/build.gradle

@@ -22,6 +22,7 @@ public List<NativeModule> createNativeModules(
         List<NativeModule> modules = new ArrayList<>();
 
         modules.add(new StartupTimer(reactContext));
+        modules.add(new ShareActionHandlerModule(reactContext));
 
         return modules;
     }

android/app/src/main/AndroidManifest.xml

@@ -1,18 +1,20 @@
 package com.expensify.chat
 
-import expo.modules.ReactActivityDelegateWrapper
-
+import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.os.Bundle
+import android.util.Log
 import android.view.KeyEvent
 import android.view.View
 import android.view.WindowInsets
 import com.expensify.chat.bootsplash.BootSplash
+import com.expensify.chat.intenthandler.IntentHandlerFactory
 import com.expensify.reactnativekeycommand.KeyCommandModule
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
 import com.facebook.react.defaults.DefaultReactActivityDelegate
+import expo.modules.ReactActivityDelegateWrapper
 
 import com.oblador.performance.RNPerformance
 
@@ -52,6 +54,25 @@ class MainActivity : ReactActivity() {
                 defaultInsets.systemWindowInsetBottom
             )
         }
+
+        if (intent != null) {
+            handleIntent(intent)
+        }
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        setIntent(intent) // Must store the new intent unless getIntent() will return the old one
+        handleIntent(intent)
+    }
+
+    private fun handleIntent(intent: Intent) {
+        try {
+            val intenthandler = IntentHandlerFactory.getIntentHandler(this, intent.type, intent.toString())
+            intenthandler?.handle(intent)
+        } catch (exception: Exception) {
+            Log.e("handleIntentException", exception.toString())
+        }
     }
 
     /**

android/app/src/main/java/com/expensify/chat/ExpensifyAppPackage.java

@@ -0,0 +1,89 @@
+package com.expensify.chat
+
+import android.content.Context
+import android.graphics.BitmapFactory
+import android.media.MediaMetadataRetriever
+import com.expensify.chat.intenthandler.IntentHandlerConstants
+import com.facebook.react.bridge.Callback
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import android.util.Log
+import com.facebook.react.bridge.ReactMethod
+import org.json.JSONObject
+import java.io.File
+
+class ShareActionHandlerModule(reactContext: ReactApplicationContext) :
+    ReactContextBaseJavaModule(reactContext) {
+
+    override fun getName(): String {
+        return "ShareActionHandler"
+    }
+
+    @ReactMethod
+    fun processFiles(callback: Callback) {
+        try {
+            val sharedPreferences = reactApplicationContext.getSharedPreferences(
+                IntentHandlerConstants.preferencesFile,
+                Context.MODE_PRIVATE
+            )
+
+            val shareObjectString = sharedPreferences.getString(IntentHandlerConstants.shareObjectProperty, null)
+            if (shareObjectString == null) {
+                callback.invoke("No data found", null)
+                return
+            }
+
+            val shareObject = JSONObject(shareObjectString)
+            val content = shareObject.optString("content")
+            val mimeType = shareObject.optString("mimeType")
+            val fileUriPath = "file://$content"
+            val timestamp = System.currentTimeMillis()
+
+            val file = File(content)
+            if (!file.exists()) {
+                val textObject = JSONObject().apply {
+                    put("id", "text")
+                    put("content", content)
+                    put("mimeType", "txt")
+                    put("processedAt", timestamp)
+                }
+                callback.invoke(textObject.toString())
+                return
+            }
+
+            val identifier = file.name
+            var aspectRatio = 0.0f
+
+            if (mimeType.startsWith("image/")) {
+                val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+                BitmapFactory.decodeFile(content, options)
+                aspectRatio = if (options.outHeight != 0) options.outWidth.toFloat() / options.outHeight else 1.0f
+            } else if (mimeType.startsWith("video/")) {
+                val retriever = MediaMetadataRetriever()
+                try {
+                    retriever.setDataSource(content)
+                    val videoWidth = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toFloatOrNull() ?: 1f
+                    val videoHeight = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toFloatOrNull() ?: 1f
+                    if (videoHeight != 0f) aspectRatio = videoWidth / videoHeight
+                } catch (e: Exception) {
+                    Log.e("ShareActionHandlerModule", "Error retrieving video metadata: ${e.message}")
+                } finally {
+                    retriever.release()
+                }
+            }
+
+            val fileData = JSONObject().apply {
+                put("id", identifier)
+                put("content", fileUriPath)
+                put("mimeType", mimeType)
+                put("processedAt", timestamp)
+                put("aspectRatio", aspectRatio)
+            }
+
+            callback.invoke(fileData.toString())
+            
+        } catch (e: Exception) {
+            callback.invoke(e.toString(), null)
+        }
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.expensify.chat.intenthandler
+
+import android.content.Context
+import com.expensify.chat.utils.FileUtils.clearInternalStorageDirectory
+
+abstract class AbstractIntentHandler: IntentHandler {
+    override fun onCompleted() {}
+
+    protected fun clearTemporaryFiles(context: Context) {
+        // Clear data present in the shared preferences
+        val sharedPreferences = context.getSharedPreferences(IntentHandlerConstants.preferencesFile, Context.MODE_PRIVATE)
+        val editor = sharedPreferences.edit()
+        editor.clear()
+        editor.apply()
+
+        // Clear leftover temporary files from previous share attempts
+        clearInternalStorageDirectory(context)
+    }
+}