Merge branch 'main' into satish/act-1358-1

.env.alfajores

@@ -13,4 +13,5 @@ SENTRY_ENABLED=true
 AUTH0_DOMAIN=auth.alfajores.valora.xyz
 ONBOARDING_FEATURES_ENABLED=CloudBackupSetup,CloudBackupRestore,CloudBackupInOnboarding,EnableBiometry,ProtectWallet
 DEEP_LINK_URL_SCHEME=celo
-USER_AGENT_APP_NAME=Valora
+# APP_REGISTRY_NAME should not contain spaces, it is used for the app buildable name and user agent header
+APP_REGISTRY_NAME=Valora

.env.alfajoresdev

@@ -15,4 +15,5 @@ SENTRY_ENABLED=false
 AUTH0_DOMAIN=auth.alfajores.valora.xyz
 ONBOARDING_FEATURES_ENABLED=CloudBackupSetup,CloudBackupRestore,CloudBackupInOnboarding,EnableBiometry,ProtectWallet
 DEEP_LINK_URL_SCHEME=celo
-USER_AGENT_APP_NAME=Valora
+# APP_REGISTRY_NAME should not contain spaces, it is used for the app buildable name and user agent header
+APP_REGISTRY_NAME=Valora

.env.alfajoresnightly

@@ -13,4 +13,5 @@ SENTRY_ENABLED=true
 AUTH0_DOMAIN=auth.alfajores.valora.xyz
 ONBOARDING_FEATURES_ENABLED=CloudBackupSetup,CloudBackupRestore,CloudBackupInOnboarding,EnableBiometry,ProtectWallet
 DEEP_LINK_URL_SCHEME=celo
-USER_AGENT_APP_NAME=Valora
+# APP_REGISTRY_NAME should not contain spaces, it is used for the app buildable name and user agent header
+APP_REGISTRY_NAME=Valora

.env.example

@@ -25,4 +25,5 @@ ENABLED_QUICK_ACTIONS=Send,Receive,Add,Swap,Withdraw
 # This example enabled all features except PhoneVerification
 ONBOARDING_FEATURES_ENABLED=CloudBackupSetup,CloudBackupRestore,CloudBackupInOnboarding,EnableBiometry,ProtectWallet
 DEEP_LINK_URL_SCHEME=celo
-USER_AGENT_APP_NAME=Valora
+# APP_REGISTRY_NAME should not contain spaces, it is used for the app buildable name and user agent header
+APP_REGISTRY_NAME=Valora

.env.mainnet

@@ -13,4 +13,5 @@ SENTRY_ENABLED=true
 AUTH0_DOMAIN=auth.valora.xyz
 ONBOARDING_FEATURES_ENABLED=CloudBackupSetup,CloudBackupRestore,CloudBackupInOnboarding,EnableBiometry,ProtectWallet
 DEEP_LINK_URL_SCHEME=celo
-USER_AGENT_APP_NAME=Valora
+# APP_REGISTRY_NAME should not contain spaces, it is used for the app buildable name and user agent header
+APP_REGISTRY_NAME=Valora

.env.mainnetdev

@@ -15,4 +15,5 @@ SENTRY_ENABLED=false
 AUTH0_DOMAIN=auth.valora.xyz
 ONBOARDING_FEATURES_ENABLED=CloudBackupSetup,CloudBackupRestore,CloudBackupInOnboarding,EnableBiometry,ProtectWallet
 DEEP_LINK_URL_SCHEME=celo
-USER_AGENT_APP_NAME=Valora
+# APP_REGISTRY_NAME should not contain spaces, it is used for the app buildable name and user agent header
+APP_REGISTRY_NAME=Valora

.env.mainnetnightly

@@ -13,4 +13,5 @@ SENTRY_ENABLED=true
 AUTH0_DOMAIN=auth.valora.xyz
 ONBOARDING_FEATURES_ENABLED=CloudBackupSetup,CloudBackupRestore,CloudBackupInOnboarding,EnableBiometry,ProtectWallet
 DEEP_LINK_URL_SCHEME=celo
-USER_AGENT_APP_NAME=Valora
+# APP_REGISTRY_NAME should not contain spaces, it is used for the app buildable name and user agent header
+APP_REGISTRY_NAME=Valora

.env.test

@@ -11,4 +11,5 @@ SENTRY_ENABLED=false
 AUTH0_DOMAIN=auth.alfajores.valora.xyz
 ONBOARDING_FEATURES_ENABLED=EnableBiometry,ProtectWallet,PhoneVerification
 DEEP_LINK_URL_SCHEME=celo
-USER_AGENT_APP_NAME=Valora
+# APP_REGISTRY_NAME should not contain spaces, it is used for the app buildable name and user agent header
+APP_REGISTRY_NAME=Valora

.github/scripts/automergeCrowdinPr.js

@@ -13,11 +13,11 @@ const CROWDIN_BRANCH = 'l10n/main'
 const CROWDIN_PR_USER = 'valora-bot-crowdin'
 
 const ALLOWED_UPDATED_FILE_MATCHER = new RegExp(
-  `locales\/.*\/translation\.json|ios/celo\/.*\/InfoPlist.strings`
+  `locales\/.*\/translation\.json|ios/MobileStack\/.*\/InfoPlist.strings`
 )
 const DISALLOWED_UPDATED_FILES = [
   'locales/base/translation.json',
-  'ios/celo/Base.lproj/InfoPlist.strings',
+  'ios/MobileStack/Base.lproj/InfoPlist.strings',
 ]
 const enableAutomergeQuery = `mutation ($pullRequestId: ID!, $mergeMethod: PullRequestMergeMethod!) {
   enablePullRequestAutoMerge(input: {

.github/workflows/bump-app-version.yml

@@ -43,7 +43,7 @@ jobs:
             const allowedUpdatedFiles = [
               'android/app/build.gradle',
               'android/gradle.properties',
-              'ios/celo.xcodeproj/project.pbxproj',
+              'ios/MobileStack.xcodeproj/project.pbxproj',
               'package.json'
             ]
             const script = require('.github/scripts/autoApprovePr.js')

.github/workflows/check-translation-files-pr.yml

@@ -22,10 +22,10 @@ jobs:
         with:
           files: |
             locales/*/translation.json
-            ios/celo/*.lproj/InfoPlist.strings
+            ios/MobileStack/*.lproj/InfoPlist.strings
           files_ignore: |
             locales/base/translation.json
-            ios/celo/Base.lproj/InfoPlist.strings
+            ios/MobileStack/Base.lproj/InfoPlist.strings
       - name: Fail if translation files are changed
         if: ${{ (github.event_name != 'merge_group') && (github.head_ref != 'l10n/main') && (steps.changed-files.outputs.any_changed == 'true') }}
         run: |

.github/workflows/e2e-android.yml

@@ -47,7 +47,7 @@ jobs:
 
           # Temporarily disable checking for EPIPE error and use yes to accept all licenses
           set +o pipefail
-          yes | sdkmanager "platform-tools" "platforms;android-33"
+          yes | sdkmanager "platform-tools" "platforms;android-${{ inputs.android-api-level }}"
           set -o pipefail
 
           # Allow the emulator to use /dev/kvm

.github/workflows/e2e-pr.yml

@@ -16,7 +16,7 @@ jobs:
     name: Android
     uses: ./.github/workflows/e2e-android.yml
     with:
-      android-api-level: 30
+      android-api-level: 34
     secrets: inherit
   ios:
     name: iOS

.prettierignore

@@ -7,9 +7,8 @@ package.json
 
 android/app/build
 # Ignore Images.xcassets as Xcode reformats them anyway when saving
-branding/celo/ios/celo/Images.xcassets
 ios/build
-ios/celo/Images.xcassets
+ios/MobileStack/Images.xcassets
 ios/Pods
 # Ignore Crowdin generated files (often they are written with no final newline)
 locales/*/*.json

WALLET.md

@@ -314,7 +314,7 @@ The below steps should help you successfully run the mobile wallet on either a U
 
 ### iOS
 
-3. Launch Xcode and use it to open the directory `celo.xcworkspace`. Confirm your iOS device has been detected by Xcode.
+3. Launch Xcode and use it to open the directory `MobileStack.xcworkspace`. Confirm your iOS device has been detected by Xcode.
 
 4. Build the project by pressing the play button in the top left corner or selecting `Product > Build` from the Xcode menu bar.
 
@@ -341,7 +341,7 @@ you may require a fresh install of the app. Instead of rebuilding the app to get
 a fresh install, you can drag drop the generated app into the simulator after
 uninstalling the app. It is typically available in the following paths:
 
-- For iOS: `$HOME/Library/Developer/Xcode/DerivedData/celo-<randomid>/Build/Products/Debug-iphonesimulator/celo.app`
+- For iOS: `$HOME/Library/Developer/Xcode/DerivedData/MobileStack-<randomid>/Build/Products/Debug-iphonesimulator/Valora.app`
 - For Android: `<path-to-wallet>/android/app/build/outputs/apk/alfajoresdev/debug/app-alfajoresdev-debug.apk`
 
 ## Debugging & App Profiling

android/app/build.gradle

@@ -160,7 +160,7 @@ android {
         missingDimensionStrategy 'react-native-camera', 'general'
         vectorDrawables.useSupportLibrary = true
         resValue "bool", "is_profiling_build", System.getenv("IS_PROFILING_BUILD") ?: "false"
-        buildConfigField "String", "USER_AGENT_APP_NAME", "\"${project.env.get("USER_AGENT_APP_NAME")}\""
+        buildConfigField "String", "APP_REGISTRY_NAME", "\"${project.env.get("APP_REGISTRY_NAME")}\""
 
         manifestPlaceholders = [
             auth0Domain: project.env.get("AUTH0_DOMAIN"),

android/app/src/main/java/org/celo/mobile/MainActivity.java

@@ -28,7 +28,7 @@ public class MainActivity extends ReactActivity {
    */
   @Override
   protected String getMainComponentName() {
-    return "celo";
+    return BuildConfig.APP_REGISTRY_NAME;
   }
 
   /**

android/app/src/main/java/org/celo/mobile/UserAgentInterceptor.java

@@ -21,7 +21,7 @@ public Response intercept(Interceptor.Chain chain) throws IOException {
         // Format we want: App/1.0.0 (Android 12; Pixel 5)
         String.format(
           "%s/%s (Android %s; %s)",
-          BuildConfig.USER_AGENT_APP_NAME,
+          BuildConfig.APP_REGISTRY_NAME,
           BuildConfig.VERSION_NAME,
           Build.VERSION.RELEASE,
           Build.MODEL

app.json

@@ -1,4 +1,4 @@
 {
-  "name": "celo",
-  "displayName": "Celo"
+  "name": "mobilestack",
+  "displayName": "MobileStack"
 }

crowdin.yml

@@ -3,5 +3,5 @@ files:
   - source: /locales/base/*.json
     translation: /locales/%locale%/%original_file_name%
     type: i18next_json
-  - source: /ios/celo/Base.lproj/InfoPlist.strings
-    translation: /ios/celo/%osx_code%/%original_file_name%
+  - source: /ios/MobileStack/Base.lproj/InfoPlist.strings
+    translation: /ios/MobileStack/%osx_code%/%original_file_name%

fastlane/Fastfile

@@ -114,10 +114,10 @@ platform :ios do
   desc 'Build the iOS application - requires environment param'
   lane :build do |options|
     gym(
-      workspace: 'ios/celo.xcworkspace',
+      workspace: 'ios/MobileStack.xcworkspace',
       # Needs double quotes because Ruby differentiates
       # https://stackoverflow.com/questions/6395288/double-vs-single-quotes
-      scheme: "celo-#{options[:environment]}",
+      scheme: "MobileStack-#{options[:environment]}",
       configuration: 'Release',
       xcargs: [
         "-allowProvisioningUpdates",

index.js

@@ -42,4 +42,4 @@ TextInput.defaultProps = {
   adjustsFontSizeToFit: true,
 }
 
-AppRegistry.registerComponent('celo', () => App)
+AppRegistry.registerComponent(Config.APP_REGISTRY_NAME, () => App)