Merge branch 'main' into ci/add-code-cov

app/util/sentryUtils.js

@@ -71,21 +71,6 @@ function simplifyErrorMessages(report) {
   });
 }
 
-function rewriteReportUrls(report) {
-  // update request url
-  report.request.url = toMetamaskUrl();
-  // update exception stack trace
-  if (report.exception && report.exception.values) {
-    report.exception.values.forEach((item) => {
-      if (item.stacktrace) {
-        item.stacktrace.frames.forEach((frame) => {
-          frame.filename = toMetamaskUrl(frame.filename);
-        });
-      }
-    });
-  }
-}
-
 function removeDeviceTimezone(report) {
   if (report.contexts && report.contexts.device)
     report.contexts.device.timezone = null;
@@ -96,11 +81,6 @@ function removeDeviceName(report) {
     report.contexts.device.name = null;
 }
 
-function toMetamaskUrl() {
-  const metamaskUrl = `metamask-mobile`;
-  return metamaskUrl;
-}
-
 function rewriteReport(report) {
   try {
     // simplify certain complex error messages (e.g. Ethjs)
@@ -112,8 +92,6 @@ function rewriteReport(report) {
     // but putting the code here as well gives public visibility to how we are handling
     // privacy with respect to sentry.
     sanitizeAddressesFromErrorMessages(report);
-    // modify report urls
-    rewriteReportUrls(report);
     // remove device timezone
     removeDeviceTimezone(report);
     // remove device name

crowdin.yml

@@ -4,13 +4,13 @@
 
 "preserve_hierarchy": true
 
+# This array identifies the files that should be the source for translations. If a translations key is used this
+# indicates that translations from the idneified files will be pushed up to Crowdin.
 files: [
  {
   "source" : "locales/languages/en.json",
-  "translation" : "/locales/languages/%two_letters_code%.json",
  },
  {
    "source" : "app/videos/subtitles/secretPhrase/subtitles-en.vtt",
-   "translation" : "/app/videos/subtitles/secretPhrase/subtitles-%two_letters_code%.vtt",
  }
 ]

package.json

@@ -46,10 +46,6 @@
     "release:android:qa": "./scripts/build.sh android QA && open android/app/build/outputs/apk/release/",
     "test": "yarn test:unit && yarn test:e2e",
     "test:unit": "jest ./app/ ./locales/",
-    "test:unit:non-components": "jest ./app/ ./locales/ --testPathIgnorePatterns=./app/components/ --forceExit",
-    "test:unit:components-ui": "./scripts/run-component-tests.js",
-    "test:unit:components-views": "jest ./app/components/Views/ --forceExit",
-    "test:unit:components-remaining": "jest ./app/components/Base/ ./app/components/hooks/ ./app/components/Nav/ --forceExit",
     "test:unit:update": "time jest -u ./app/",
     "test:e2e": "yarn test:e2e:ios && yarn test:e2e:android",
     "test:e2e:ios": "detox build -c ios.sim.release && detox test -c ios.sim.release",