Merge branch 'main' into modify-mockserver-for-android

MetaMask · Oct 22, 2024 · ce86451 · ce86451
2 parents a392903 + a22efa0
commit ce86451
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -17,7 +17,7 @@ setupSentry();
 import { AppRegistry, LogBox, ErrorUtils } from 'react-native';
 import Root from './app/components/Views/Root';
 import { name } from './app.json';
-import { isTest } from './app/util/test/utils.js';
+import { isE2E } from './app/util/test/utils.js';
 
 import { Performance } from './app/core/Performance';
 import { handleCustomError, setReactNativeDefaultHandler } from './app/core/ErrorHandler';
@@ -90,7 +90,7 @@ if (IGNORE_BOXLOGS_DEVELOPMENT === 'true') {
  */
 AppRegistry.registerComponent(name, () =>
   // Disable Sentry for E2E tests
-  isTest ? Root : Sentry.wrap(Root),
+  isE2E ? Root : Sentry.wrap(Root),
 );
 
 function setupGlobalErrorHandler() {

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -215,6 +215,7 @@ buildAndroidRun(){
 }
 
 buildAndroidRunQA(){
+	remapEnvVariableLocal
 	prebuild_android
 	react-native run-android --port=$WATCHER_PORT --variant=qaDebug --active-arch-only
 }
@@ -551,6 +552,7 @@ buildIos() {
 
 startWatcher() {
 	source $JS_ENV_FILE
+	remapEnvVariableLocal
   	WATCHER_PORT=${WATCHER_PORT:-8081}
 	if [ "$MODE" == "clean" ]; then
 		watchman watch-del-all