Merge branch 'develop' into salim/ignore-tokens-non-current-network

Author: salimtb

.circleci/config.yml

@@ -103,9 +103,11 @@ workflows:
   test_and_release:
     when:
       not:
-        matches:
-          pattern: /^l10n_crowdin_action$/
-          value: << pipeline.git.branch >>
+        or:
+          - matches:
+              pattern: /^l10n_crowdin_action$/
+              value: << pipeline.git.branch >>
+          - equal: [rerun-from-failed, << pipeline.schedule.name >>]
     jobs:
       - create_release_pull_request:
           <<: *rc_branch_only
@@ -176,6 +178,7 @@ workflows:
       - prep-build-test-mmi:
           requires:
             - prep-deps
+            - check-mmi-trigger
       - prep-build-test-mmi-playwright:
           requires:
             - prep-deps
@@ -358,8 +361,7 @@ workflows:
 
   rerun-from-failed:
     when:
-      condition:
-        equal: ["<< pipeline.schedule.name >>", "rerun-from-failed"]
+      equal: [rerun-from-failed, << pipeline.schedule.name >>]
     jobs:
       - prep-deps
       - rerun-workflows-from-failed:
@@ -802,6 +804,7 @@ jobs:
       - run: corepack enable
       - attach_workspace:
           at: .
+      - run: *check-mmi-trigger
       - run:
           name: Build extension for testing
           command: yarn build:test:mmi
@@ -1196,6 +1199,7 @@ jobs:
       - run: sudo corepack enable
       - attach_workspace:
           at: .
+      - run: *check-mmi-trigger
       - run:
           name: Move test build to dist
           command: mv ./dist-test-mmi ./dist
@@ -1285,6 +1289,7 @@ jobs:
       - run: sudo corepack enable
       - attach_workspace:
           at: .
+      - run: *check-mmi-trigger
       - run:
           name: Move test build to dist
           command: mv ./dist-test-mmi ./dist

.github/workflows/sonarcloud.yml

@@ -8,7 +8,7 @@ name: SonarCloud
 on:
   workflow_run:
     workflows:
-      - Run tests
+      - Main
     types:
       - completed
 

app/_locales/de/messages.json

@@ -383,12 +383,11 @@ export default class SwapsController extends BaseController<
       const [firstQuote] = Object.values(newQuotes);
 
       // For a user to be able to swap a token, they need to have approved the MetaSwap contract to withdraw that token.
-      // _getERC20Allowance() returns the amount of the token they have approved for withdrawal. If that amount is greater
-      // than 0, it means that approval has already occurred and is not needed. Otherwise, for tokens to be swapped, a new
-      // call of the ERC-20 approve method is required.
+      // _getERC20Allowance() returns the amount of the token they have approved for withdrawal. If that amount is either
+      // zero or less than the soucreAmount of the swap, a new call of the ERC-20 approve method is required.
       approvalRequired =
         firstQuote.approvalNeeded &&
-        allowance.eq(0) &&
+        (allowance.eq(0) || allowance.lt(firstQuote.sourceAmount)) &&
         firstQuote.aggregator !== 'wrappedNative';
       if (!approvalRequired) {
         newQuotes = mapValues(newQuotes, (quote) => ({

app/_locales/el/messages.json

@@ -11,6 +11,7 @@ export type ManifestFlags = {
   };
   sentry?: {
     tracesSampleRate?: number;
+    lazyLoadSubSampleRate?: number; // multiply by tracesSampleRate to get the actual probability
     forceEnable?: boolean;
   };
 };
@@ -27,6 +28,14 @@ interface WebExtensionManifestWithFlags
  * @returns flags if they exist, otherwise an empty object
  */
 export function getManifestFlags(): ManifestFlags {
+  // If this is running in a unit test, there's no manifest, so just return an empty object
+  if (
+    process.env.JEST_WORKER_ID === undefined ||
+    !browser.runtime.getManifest
+  ) {
+    return {};
+  }
+
   return (
     (browser.runtime.getManifest() as WebExtensionManifestWithFlags)._flags ||
     {}