Merge branch 'develop' into fixissue

MetaMask · Jun 1, 2023 · e344874 · e344874
2 parents c78777a + c146023
commit e344874
Show file tree

Hide file tree

Showing 53 changed files with 2,910 additions and 1,815 deletions.
diff --git a/...hes/squirrelly-npm-8.0.8-1d17420d8d.patch → ...hes/squirrelly-npm-9.0.0-3cf710c7bb.patch b/...hes/squirrelly-npm-8.0.8-1d17420d8d.patch → ...hes/squirrelly-npm-9.0.0-3cf710c7bb.patch
@@ -1,5 +1,5 @@
 diff --git a/dist/squirrelly.cjs.js b/dist/squirrelly.cjs.js
-index 4680ee747900853b9af01b480c749880dedb9824..95dce7623bc115508063a78c7de9ed7b6e4d3d82 100644
+index b87580be5da8a9a5af4cf60c8c5acf910c8f9ed2..e037b8a986d331f7075bbd448c80104de8a3453c 100644
 --- a/dist/squirrelly.cjs.js
 +++ b/dist/squirrelly.cjs.js
 @@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ To learn how to contribute to the MetaMask project itself, visit our [Internal D
 - Install [Yarn v3](https://yarnpkg.com/getting-started/install)
     - ONLY follow the steps in the "Install Corepack" and "Updating the global Yarn version" sections
     - DO NOT take any of the steps in the "Initializing your project", "Updating to the latest versions" or "Installing the latest build fresh from master" sections. These steps could result in your repo being reset or installing the wrong yarn version, which can break your build.
-- Copy the `.metamaskrc.dist` file to `.metamaskrc`
+- Duplicate `.metamaskrc.dist` within the root and rename it to `.metamaskrc`
   - Replace the `INFURA_PROJECT_ID` value with your own personal [Infura Project ID](https://infura.io/docs).
   - If debugging MetaMetrics, you'll need to add a value for `SEGMENT_WRITE_KEY` [Segment write key](https://segment.com/docs/connections/find-writekey/), see [Developing on MetaMask - Segment](./development/README.md#segment).
   - If debugging unhandled exceptions, you'll need to add a value for `SENTRY_DSN` [Sentry Dsn](https://docs.sentry.io/product/sentry-basics/dsn-explainer/), see [Developing on MetaMask - Sentry](./development/README.md#sentry).

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/app/manifest/v3/chrome.json b/app/manifest/v3/chrome.json
@@ -6,5 +6,5 @@
     "matches": ["https://metamask.io/*"],
     "ids": ["*"]
   },
-  "minimum_chrome_version": "80"
+  "minimum_chrome_version": "88"
 }
diff --git a/app/scripts/controllers/app-state.js b/app/scripts/controllers/app-state.js
@@ -183,6 +183,20 @@ export default class AppStateController extends EventEmitter {
     });
   }
 
+  ///: BEGIN:ONLY_INCLUDE_IN(snaps)
+  /**
+   * Record if popover for snaps privacy warning has been shown
+   * on the first install of a snap.
+   *
+   * @param {boolean} shown - shown status
+   */
+  setSnapsInstallPrivacyWarningShownStatus(shown) {
+    this.store.updateState({
+      snapsInstallPrivacyWarningShown: shown,
+    });
+  }
+  ///: END:ONLY_INCLUDE_IN
+
   /**
    * Record the timestamp of the last time the user has seen the outdated browser warning
    *

diff --git a/app/scripts/controllers/app-state.test.js b/app/scripts/controllers/app-state.test.js
@@ -346,4 +346,23 @@ describe('AppStateController', () => {
       );
     });
   });
+
+  describe('setSnapsInstallPrivacyWarningShownStatus', () => {
+    it('updates the status of snaps install privacy warning', () => {
+      appStateController = createAppStateController();
+      const updateStateSpy = jest.spyOn(
+        appStateController.store,
+        'updateState',
+      );
+
+      appStateController.setSnapsInstallPrivacyWarningShownStatus(true);
+
+      expect(updateStateSpy).toHaveBeenCalledTimes(1);
+      expect(updateStateSpy).toHaveBeenCalledWith({
+        snapsInstallPrivacyWarningShown: true,
+      });
+
+      updateStateSpy.mockRestore();
+    });
+  });
 });