feat: New mobile Flask Build Type

android/app/build.gradle

@@ -152,25 +152,31 @@ android {
 	  }
 
 	  signingConfigs {
-		release {
-            storeFile file('../keystores/release.keystore')
-            storePassword System.getenv("BITRISEIO_ANDROID_KEYSTORE_PASSWORD")
-            keyAlias System.getenv("BITRISEIO_ANDROID_KEYSTORE_ALIAS")
-            keyPassword System.getenv("BITRISEIO_ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD")
-		}
-        qa {
-            storeFile file('../keystores/internalRelease.keystore')
-            storePassword System.getenv("BITRISEIO_ANDROID_QA_KEYSTORE_PASSWORD")
-            keyAlias System.getenv("BITRISEIO_ANDROID_QA_KEYSTORE_ALIAS")
-            keyPassword System.getenv("BITRISEIO_ANDROID_QA_KEYSTORE_PRIVATE_KEY_PASSWORD")
-        }
-	    debug {
-            storeFile file('debug.keystore')
-            storePassword 'android'
-            keyAlias 'androiddebugkey'
-            keyPassword 'android'
-        }
-	  }
+      release {
+        storeFile file('../keystores/release.keystore')
+        storePassword System.getenv("BITRISEIO_ANDROID_KEYSTORE_PASSWORD")
+        keyAlias System.getenv("BITRISEIO_ANDROID_KEYSTORE_ALIAS")
+        keyPassword System.getenv("BITRISEIO_ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD")
+      }
+      qa {
+        storeFile file('../keystores/internalRelease.keystore')
+        storePassword System.getenv("BITRISEIO_ANDROID_QA_KEYSTORE_PASSWORD")
+        keyAlias System.getenv("BITRISEIO_ANDROID_QA_KEYSTORE_ALIAS")
+        keyPassword System.getenv("BITRISEIO_ANDROID_QA_KEYSTORE_PRIVATE_KEY_PASSWORD")
+      }
+      debug {
+        storeFile file('debug.keystore')
+        storePassword 'android'
+        keyAlias 'androiddebugkey'
+        keyPassword 'android'
+      }
+      flask {
+        storeFile file('../keystores/flaskRelease.keystore')
+        storePassword System.getenv("BITRISEIO_ANDROID_FLASK_KEYSTORE_PASSWORD")
+        keyAlias System.getenv("BITRISEIO_ANDROID_FLASK_KEYSTORE_ALIAS")
+        keyPassword System.getenv("BITRISEIO_ANDROID_FLASK_KEYSTORE_PRIVATE_KEY_PASSWORD")
+      }
+    }
 
     splits {
         abi {
@@ -206,6 +212,12 @@ android {
             applicationId "io.metamask"
             signingConfig signingConfigs.release
           }
+          flask {
+            dimension "version"
+            applicationIdSuffix ".flask"
+            applicationId "io.metamask"
+            signingConfig signingConfigs.flask
+          }
     	  }
 
 	  buildTypes.each {

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

@@ -0,0 +1,3 @@
+<resources>
+	<string name="app_name">MetaMask Flask</string>
+</resources>

app/components/Nav/App/index.js

@@ -31,7 +31,7 @@ import branch from 'react-native-branch';
 import AppConstants from '../../../core/AppConstants';
 import Logger from '../../../util/Logger';
 import { trackErrorAsAnalytics } from '../../../util/analyticsV2';
-import { routingInstrumentation } from '../../../util/sentryUtils';
+import { routingInstrumentation } from '../../../util/sentry/utils';
 import Analytics from '../../../core/Analytics/Analytics';
 import { connect, useDispatch } from 'react-redux';
 import {

app/components/Views/Settings/index.tsx

@@ -167,6 +167,12 @@ const Settings = () => {
     trackEvent(MetaMetricsEvents.NAVIGATION_TAPS_LOGOUT);
   };
 
+  let aboutMetaMaskTitle = strings('app_settings.info_title');
+
+  ///: BEGIN:ONLY_INCLUDE_IN(flask)
+  aboutMetaMaskTitle = strings('app_settings.info_title_flask');
+  ///: END:ONLY_INCLUDE_IN
+
   return (
     <ScrollView style={styles.wrapper}>
       <SettingsDrawer
@@ -213,7 +219,7 @@ const Settings = () => {
         testID={EXPERIMENTAL_SETTINGS}
       />
       <SettingsDrawer
-        title={strings('app_settings.info_title')}
+        title={aboutMetaMaskTitle}
         onPress={onPressInfo}
         testID={ABOUT_METAMASK_SETTINGS}
       />

app/transforms/remove-fenced-code.js

@@ -394,6 +394,13 @@ eslintrc.overrides.forEach((override) => {
   override.rules = rules;
 });
 
+// also override the rules section
+// We don't want linting to fail for purely stylistic reasons.
+eslintrc.rules['prettier/prettier'] = 0;
+// Sometimes we use `let` instead of `const` to assign variables depending on
+// the build type.
+eslintrc.rules['prefer-const'] = 0;
+
 // Remove all test-related overrides. We will never lint test files here.
 eslintrc.overrides = eslintrc.overrides.filter(
   (override) =>

app/util/sentryUtils.js → app/util/sentry/utils.js

@@ -1,12 +1,13 @@
 /* eslint-disable import/no-namespace */
 import * as Sentry from '@sentry/react-native';
 import { Dedupe, ExtraErrorData } from '@sentry/integrations';
-import extractEthJsErrorMessage from './extractEthJsErrorMessage';
+import extractEthJsErrorMessage from '../extractEthJsErrorMessage';
 import DefaultPreference from 'react-native-default-preference';
-import { AGREED, METRICS_OPT_IN } from '../constants/storage';
-import { regex } from './regex';
+import { regex } from '../regex';
+import { AGREED, METRICS_OPT_IN } from '../../constants/storage';
 
 const METAMASK_ENVIRONMENT = process.env['METAMASK_ENVIRONMENT'] || 'local'; // eslint-disable-line dot-notation
+const METAMASK_BUILD_TYPE = process.env['METAMASK_BUILD_TYPE'] || 'main'; // eslint-disable-line dot-notation
 
 const ERROR_URL_ALLOWLIST = [
   'cryptocompare.com',
@@ -128,17 +129,50 @@ function sanitizeAddressesFromErrorMessages(report) {
   });
 }
 
+/**
+ * Derives the Sentry environment based on input parameters.
+ * This function is similar to the environment logic used in MetaMask extension.
+ * - https://github.com/MetaMask/metamask-extension/blob/34375a57e558853aab95fe35d5f278aa52b66636/app/scripts/lib/setupSentry.js#L91
+ *
+ * @param {boolean} isDev - Represents if the current environment is development (__DEV__ global variable).
+ * @param {string} [metamaskEnvironment='local'] - The environment MetaMask is running in
+ *                                                  (process.env.METAMASK_ENVIRONMENT).
+ *                                                  It defaults to 'local' if not provided.
+ * @param {string} [metamaskBuildType='main'] - The build type of MetaMask
+ *                                              (process.env.METAMASK_BUILD_TYPE).
+ *                                              It defaults to 'main' if not provided.
+ *
+ * @returns {string} - "metamaskEnvironment-metamaskBuildType" or just "metamaskEnvironment" if the build type is "main".
+ */
+export function deriveSentryEnvironment(
+  isDev,
+  metamaskEnvironment = 'local',
+  metamaskBuildType = 'main',
+) {
+  if (isDev || !metamaskEnvironment) {
+    return 'development';
+  }
+
+  if (metamaskBuildType === 'main') {
+    return metamaskEnvironment;
+  }
+
+  return `${metamaskEnvironment}-${metamaskBuildType}`;
+}
+
 // Setup sentry remote error reporting
 export function setupSentry() {
   const init = async () => {
     const dsn = process.env.MM_SENTRY_DSN;
 
-    const environment =
-      __DEV__ || !METAMASK_ENVIRONMENT ? 'development' : METAMASK_ENVIRONMENT;
-
     const metricsOptIn = await DefaultPreference.get(METRICS_OPT_IN);
 
     const integrations = [new Dedupe(), new ExtraErrorData()];
+    const environment = deriveSentryEnvironment(
+      __DEV__,
+      METAMASK_ENVIRONMENT,
+      METAMASK_BUILD_TYPE,
+    );
 
     Sentry.init({
       dsn,

app/util/sentry/utils.test.ts

@@ -0,0 +1,81 @@
+/* eslint-disable dot-notation */
+import { deriveSentryEnvironment } from './utils';
+
+describe('deriveSentryEnvironment', () => {
+  test('returns production-flask for non-dev production environment and flask build type', async () => {
+    const METAMASK_ENVIRONMENT = 'production';
+    const METAMASK_BUILD_TYPE = 'flask';
+    const isDev = false;
+
+    const env = deriveSentryEnvironment(
+      isDev,
+      METAMASK_ENVIRONMENT,
+      METAMASK_BUILD_TYPE,
+    );
+    expect(env).toBe('production-flask');
+  });
+
+  test('returns local-flask for non-dev undefined environment and flask build type', async () => {
+    const METAMASK_BUILD_TYPE = 'flask';
+    const isDev = false;
+
+    const env = deriveSentryEnvironment(isDev, undefined, METAMASK_BUILD_TYPE);
+    expect(env).toBe('local-flask');
+  });
+
+  test('returns debug-flask for non-dev flask environment debug build type', async () => {
+    const METAMASK_BUILD_TYPE = 'flask';
+    const METAMASK_ENVIRONMENT = 'debug';
+    const isDev = false;
+
+    const env = deriveSentryEnvironment(
+      isDev,
+      METAMASK_ENVIRONMENT,
+      METAMASK_BUILD_TYPE,
+    );
+    expect(env).toBe('debug-flask');
+  });
+
+  test('returns local for non-dev local environment and undefined build type', async () => {
+    const isDev = false;
+    const METAMASK_ENVIRONMENT = 'local';
+
+    const env = deriveSentryEnvironment(isDev, METAMASK_ENVIRONMENT);
+    expect(env).toBe('local');
+  });
+
+  test('returns local for non-dev with both undefined environment and build type', async () => {
+    const isDev = false;
+
+    const env = deriveSentryEnvironment(isDev);
+    expect(env).toBe('local');
+  });
+
+  test('returns production for non-dev production environment and undefined  build type', async () => {
+    const METAMASK_ENVIRONMENT = 'production';
+    const isDev = false;
+
+    const env = deriveSentryEnvironment(isDev, METAMASK_ENVIRONMENT, undefined);
+    expect(env).toBe('production');
+  });
+
+  test('returns development for dev environment', async () => {
+    const isDev = true;
+
+    const env = deriveSentryEnvironment(isDev, '', '');
+    expect(env).toBe('development');
+  });
+
+  test('returns development for dev environment regardless of environment and build type', async () => {
+    const isDev = true;
+    const METAMASK_ENVIRONMENT = 'production';
+    const METAMASK_BUILD_TYPE = 'flask';
+
+    const env = deriveSentryEnvironment(
+      isDev,
+      METAMASK_ENVIRONMENT,
+      METAMASK_BUILD_TYPE,
+    );
+    expect(env).toBe('development');
+  });
+});

babel.config.js

@@ -12,4 +12,5 @@ module.exports = {
     },
   },
   comments: false,
+  compact: true,
 };