Merge branch 'main' into youssef_approve_money_request

.github/workflows/platformDeploy.yml

@@ -77,7 +77,7 @@ jobs:
 
       - name: Upload Android version 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=@./android/app/build/outputs/bundle/release/app-release.aab"
+        run: curl -u "$BROWSERSTACK" -X POST "https://api-cloud.browserstack.com/app-live/upload" -F "file=@./android/app/build/outputs/bundle/productionRelease/app-production-release.aab"
         env:
           BROWSERSTACK: ${{ secrets.BROWSERSTACK }}
 

.github/workflows/testBuild.yml

@@ -11,7 +11,7 @@ on:
     branches: ['*ci-test/**']
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
 
 jobs:
   validateActor:
@@ -138,6 +138,9 @@ jobs:
 
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
+      - name: Setup Xcode
+        run: sudo xcode-select -switch /Applications/Xcode_14.2.app
+
       - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
         with:
           ruby-version: '2.7'
@@ -151,7 +154,7 @@ jobs:
           command: cd ios && bundle exec pod install
 
       - name: Decrypt profile
-        run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output chat_expensify_adhoc.mobileprovision chat_expensify_adhoc.mobileprovision.gpg
+        run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output expensify_chat_adhoc.mobileprovision expensify_chat_adhoc.mobileprovision.gpg
         env:
           LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 

.well-known/apple-app-site-association

@@ -32,6 +32,10 @@
                         "/": "/iou/*",
                         "comment": "I Owe You reports"
                     },
+                    {
+                        "/": "/request/*",
+                        "comment": "Money request"
+                    },
                     {
                         "/": "/enable-payments/*",
                         "comment": "Payments setup"

android/app/build.gradle

@@ -53,8 +53,12 @@ react {
 }
 
 project.ext.envConfigFiles = [
-    debug: ".env",
-    release: ".env.production",
+    productionDebug: ".env.production",
+    productionRelease: ".env.production",
+    adhocRelease: ".env.adhoc",
+    developmentRelease: ".env",
+    developmentDebug: ".env",
+    e2eRelease: ".env.production"
 ]
 
 /**
@@ -86,18 +90,39 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001035204
-        versionName "1.3.52-4"
+        versionCode 1001035411
+        versionName "1.3.54-11"
+    }
+
+    flavorDimensions "default"
+    productFlavors {
+        // we need to define a production flavor but since it has default config, we can leave it empty
+        production
+        e2e {
+            // If  are building a version that won't be uploaded to the play store, we don't have to use production keys
+            // applies all non-production flavors
+            applicationIdSuffix ".adhoc"
+            signingConfig signingConfigs.debug
+            resValue "string", "build_config_package", "com.expensify.chat"
+        }
+        adhoc {
+            applicationIdSuffix ".adhoc"
+            signingConfig signingConfigs.debug
+            resValue "string", "build_config_package", "com.expensify.chat"
+        }
+        development {
+            applicationIdSuffix ".dev"
+            signingConfig signingConfigs.debug
+            resValue "string", "build_config_package", "com.expensify.chat"
+        }
     }
 
     signingConfigs {
         release {
-            if (project.hasProperty('MYAPP_UPLOAD_STORE_FILE')) {
-                storeFile file(MYAPP_UPLOAD_STORE_FILE)
-                storePassword System.getenv('MYAPP_UPLOAD_STORE_PASSWORD')
-                keyAlias MYAPP_UPLOAD_KEY_ALIAS
-                keyPassword System.getenv('MYAPP_UPLOAD_KEY_PASSWORD')
-            }
+            storeFile file(MYAPP_UPLOAD_STORE_FILE)
+            storePassword System.getenv('MYAPP_UPLOAD_STORE_PASSWORD')
+            keyAlias MYAPP_UPLOAD_KEY_ALIAS
+            keyPassword System.getenv('MYAPP_UPLOAD_KEY_PASSWORD')
         }
         debug {
             storeFile file('debug.keystore')
@@ -112,19 +137,16 @@ android {
         }
         release {
             signingConfig signingConfigs.release
+            productFlavors.production.signingConfig signingConfigs.release
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
-        // We need a custom build type, so we can allow http clear text traffic in a release build:
-        e2eRelease {
-            initWith release
-            matchingFallbacks = ['release']
-            signingConfig signingConfigs.debug
-        }
-        internalRelease {
-            initWith release
-            matchingFallbacks = ['release']
-            signingConfig signingConfigs.debug
+    }
+
+    // since we don't need variants adhocDebug and e2eDebug, we can force gradle to ignore them
+    variantFilter { variant ->
+        if (variant.name == "adhocDebug" || variant.name == "e2eDebug") {
+            setIgnore(true)
         }
     }
 }
@@ -170,16 +192,13 @@ dependencies {
     // Fixes a version conflict between airship and react-native-plaid-link-sdk
     // This may be fixed by a newer version of the plaid SDK (not working as of 10.0.0)
     implementation "androidx.work:work-runtime-ktx:2.8.0"
-    
+
     // This okhttp3 dependency prevents the app from crashing - See https://github.com/plaid/react-native-plaid-link-sdk/issues/74#issuecomment-648435002
     implementation "com.squareup.okhttp3:okhttp-urlconnection:4.+"
 
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0")
 }
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
-def googleServicesFile = rootProject.file('app/google-services.json')
-if (googleServicesFile.exists()) {
-    apply plugin: 'com.google.gms.google-services'  // Google Play services Gradle plugin
-}
+apply plugin: 'com.google.gms.google-services'  // Google Play services Gradle plugin
 apply plugin: 'com.google.firebase.crashlytics'

android/app/google-services.json

@@ -1,47 +1,143 @@
 {
     "project_info": {
-        "project_number": "921154746561",
-        "firebase_url": "https://expensify-chat.firebaseio.com",
-        "project_id": "expensify-chat",
-        "storage_bucket": "expensify-chat.appspot.com"
+      "project_number": "921154746561",
+      "firebase_url": "https://expensify-chat.firebaseio.com",
+      "project_id": "expensify-chat",
+      "storage_bucket": "expensify-chat.appspot.com"
     },
     "client": [
-        {
-            "client_info": {
-                "mobilesdk_app_id": "1:921154746561:android:4f04268f25f84eaf027c40",
-                "android_client_info": {
-                    "package_name": "com.expensify.chat"
-                }
-            },
-            "oauth_client": [
-                {
-                    "client_id": "921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com",
-                    "client_type": 3
-                }
-            ],
-            "api_key": [
-                {
-                    "current_key": "AIzaSyCVwQb9lBI06bDIwHOw10AkdJyquXoMngk"
+      {
+        "client_info": {
+          "mobilesdk_app_id": "1:921154746561:android:4f04268f25f84eaf027c40",
+          "android_client_info": {
+            "package_name": "com.expensify.chat"
+          }
+        },
+        "oauth_client": [
+          {
+            "client_id": "921154746561-o0pgqgc84e3e97s9iljlmimcb5nesqad.apps.googleusercontent.com",
+            "client_type": 1,
+            "android_info": {
+              "package_name": "com.expensify.chat",
+              "certificate_hash": "5e8f16062ea3cd2c4a0d547876baa6f38cabf625"
+            }
+          },
+          {
+            "client_id": "921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com",
+            "client_type": 3
+          }
+        ],
+        "api_key": [
+          {
+            "current_key": "AIzaSyCVwQb9lBI06bDIwHOw10AkdJyquXoMngk"
+          }
+        ],
+        "services": {
+          "appinvite_service": {
+            "other_platform_oauth_client": [
+              {
+                "client_id": "921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com",
+                "client_type": 3
+              },
+              {
+                "client_id": "921154746561-080fav7kvk6s70k6nd70mt50isubgff4.apps.googleusercontent.com",
+                "client_type": 2,
+                "ios_info": {
+                  "bundle_id": "com.expensify.chat.adhoc"
                 }
-            ],
-            "services": {
-                "appinvite_service": {
-                    "other_platform_oauth_client": [
-                        {
-                            "client_id": "921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com",
-                            "client_type": 3
-                        },
-                        {
-                            "client_id": "921154746561-s3uqn2oe4m85tufi6mqflbfbuajrm2i3.apps.googleusercontent.com",
-                            "client_type": 2,
-                            "ios_info": {
-                                "bundle_id": "com.chat.expensify.chat"
-                            }
-                        }
-                    ]
+              }
+            ]
+          }
+        }
+      },
+      {
+        "client_info": {
+          "mobilesdk_app_id": "1:921154746561:android:333e293a7fef83a8027c40",
+          "android_client_info": {
+            "package_name": "com.expensify.chat.adhoc"
+          }
+        },
+        "oauth_client": [
+          {
+            "client_id": "921154746561-cbegir0tnc2gan6k1gre5vtn75p60hom.apps.googleusercontent.com",
+            "client_type": 1,
+            "android_info": {
+              "package_name": "com.expensify.chat.adhoc",
+              "certificate_hash": "5e8f16062ea3cd2c4a0d547876baa6f38cabf625"
+            }
+          },
+          {
+            "client_id": "921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com",
+            "client_type": 3
+          }
+        ],
+        "api_key": [
+          {
+            "current_key": "AIzaSyCVwQb9lBI06bDIwHOw10AkdJyquXoMngk"
+          }
+        ],
+        "services": {
+          "appinvite_service": {
+            "other_platform_oauth_client": [
+              {
+                "client_id": "921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com",
+                "client_type": 3
+              },
+              {
+                "client_id": "921154746561-080fav7kvk6s70k6nd70mt50isubgff4.apps.googleusercontent.com",
+                "client_type": 2,
+                "ios_info": {
+                  "bundle_id": "com.expensify.chat.adhoc"
                 }
+              }
+            ]
+          }
+        }
+      },
+      {
+        "client_info": {
+          "mobilesdk_app_id": "1:921154746561:android:3b19fdbaedb5b586027c40",
+          "android_client_info": {
+            "package_name": "com.expensify.chat.dev"
+          }
+        },
+        "oauth_client": [
+          {
+            "client_id": "921154746561-svjnccrcn6vet45kn9o7sibb3jemipa6.apps.googleusercontent.com",
+            "client_type": 1,
+            "android_info": {
+              "package_name": "com.expensify.chat.dev",
+              "certificate_hash": "5e8f16062ea3cd2c4a0d547876baa6f38cabf625"
             }
+          },
+          {
+            "client_id": "921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com",
+            "client_type": 3
+          }
+        ],
+        "api_key": [
+          {
+            "current_key": "AIzaSyCVwQb9lBI06bDIwHOw10AkdJyquXoMngk"
+          }
+        ],
+        "services": {
+          "appinvite_service": {
+            "other_platform_oauth_client": [
+              {
+                "client_id": "921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com",
+                "client_type": 3
+              },
+              {
+                "client_id": "921154746561-080fav7kvk6s70k6nd70mt50isubgff4.apps.googleusercontent.com",
+                "client_type": 2,
+                "ios_info": {
+                  "bundle_id": "com.expensify.chat.adhoc"
+                }
+              }
+            ]
+          }
         }
+      }
     ],
     "configuration_version": "1"
-}
+  }

android/app/src/adhoc/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/adhoc/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/adhoc/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#3DDC84</color>
+</resources>

android/app/src/adhoc/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">New Expensify AdHoc</string>
+</resources>

android/app/src/development/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/development/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/development/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#3DDC84</color>
+</resources>

android/app/src/development/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">New Expensify Dev</string>
+</resources>