Merge branch 'main' into cryptotavares/improve-get-metamask-accounts-selector-performance

Author: cryptotavares

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [13.10.4]
+
+### Fixed
+
+- Signed deep links with empty `sig_params` with extra params as valid (#38142)
+- Adds mon as currency to fetch prices (#38261)
+- Removes sidepanel from chrome manifest files (#38242)
+
 ## [13.10.3]
 
 ### Fixed
@@ -1239,7 +1247,8 @@ authorized by the user.` error until the user fully revoked dapp
 - This changelog was split off with 12.22.0
 - All older changes can be found in [docs/CHANGELOG_older.md](https://github.com/MetaMask/metamask-extension/blob/main/docs/CHANGELOG_older.md)
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.10.3...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.10.4...HEAD
+[13.10.4]: https://github.com/MetaMask/metamask-extension/compare/v13.10.3...v13.10.4
 [13.10.3]: https://github.com/MetaMask/metamask-extension/compare/v13.10.2...v13.10.3
 [13.10.2]: https://github.com/MetaMask/metamask-extension/compare/v13.10.1...v13.10.2
 [13.10.1]: https://github.com/MetaMask/metamask-extension/compare/v13.10.0...v13.10.1

app/_locales/en/messages.json

@@ -88,7 +88,6 @@
     "webRequest",
     "offscreen",
     "identity",
-    "sidePanel",
     "contextMenus"
   ],
   "sandbox": {

app/_locales/en_GB/messages.json

@@ -10,8 +10,5 @@
     "matches": ["http://*/*", "https://*/*"],
     "ids": ["*"]
   },
-  "minimum_chrome_version": "115",
-  "side_panel": {
-    "default_path": "sidepanel.html"
-  }
+  "minimum_chrome_version": "115"
 }

app/_locales/ga/messages.json

@@ -525,7 +525,7 @@ describe('RewardsDataService', () => {
 
       expect(result).toEqual(mockLoginResponse);
       expect(mockFetch).toHaveBeenCalledWith(
-        `${REWARDS_API_URL.PRD}/auth/mobile-login`,
+        `${REWARDS_API_URL.UAT}/auth/mobile-login`,
         expect.objectContaining({
           method: 'POST',
           body: JSON.stringify(mockLoginRequest),
@@ -790,7 +790,7 @@ describe('RewardsDataService', () => {
 
       expect(result).toEqual(mockSeasonStateResponse);
       expect(mockFetch).toHaveBeenCalledWith(
-        `${REWARDS_API_URL.PRD}/seasons/${mockSeasonId}/state`,
+        `${REWARDS_API_URL.UAT}/seasons/${mockSeasonId}/state`,
         {
           credentials: 'omit',
           method: 'GET',
@@ -1071,7 +1071,7 @@ describe('RewardsDataService', () => {
       // Assert
       expect(result).toEqual(mockOptInStatusResponse);
       expect(mockFetch).toHaveBeenCalledWith(
-        `${REWARDS_API_URL.PRD}/public/rewards/ois`,
+        `${REWARDS_API_URL.UAT}/public/rewards/ois`,
         expect.objectContaining({
           method: 'POST',
           body: JSON.stringify(mockOptInStatusRequest),
@@ -1392,7 +1392,7 @@ describe('RewardsDataService', () => {
       );
     });
 
-    it('uses PRD URL for non-production environments', async () => {
+    it('uses UAT URL for non-production environments', async () => {
       delete process.env.METAMASK_ENVIRONMENT;
       service = createService();
 
@@ -1405,11 +1405,11 @@ describe('RewardsDataService', () => {
       await service.validateReferralCode('TEST');
 
       expect(mockFetch).toHaveBeenCalledWith(
-        expect.stringContaining(REWARDS_API_URL.PRD),
+        expect.stringContaining(REWARDS_API_URL.UAT),
         expect.any(Object),
       );
       expect(mockFetch).toHaveBeenCalledWith(
-        `${REWARDS_API_URL.PRD}/referral/validate?code=TEST`,
+        `${REWARDS_API_URL.UAT}/referral/validate?code=TEST`,
         expect.any(Object),
       );
     });

app/manifest/v3/_base.json

@@ -168,7 +168,7 @@ export class RewardsDataService {
     ) {
       return REWARDS_API_URL.PRD;
     }
-    return REWARDS_API_URL.PRD;
+    return REWARDS_API_URL.UAT;
   }
 
   /**

app/manifest/v3/chrome.json

@@ -28,8 +28,20 @@ class LatticeKeyringOffscreen extends LatticeKeyring {
     super(opts);
   }
 
-  async _getCreds() {
+  async _getCreds(): Promise<
+    | {
+        deviceID: string;
+        password: string;
+        endpoint?: string;
+      }
+    | undefined
+  > {
     try {
+      // If we already have credentials cached
+      if (this._hasCreds()) {
+        return undefined;
+      }
+
       // If we are not aware of what Lattice we should be talking to,
       // we need to open a window that lets the user go through the
       // pairing or connection process.
@@ -41,7 +53,7 @@ class LatticeKeyringOffscreen extends LatticeKeyring {
       const creds = await new Promise<{
         deviceID: string;
         password: string;
-        endpoint: string;
+        endpoint?: string;
       }>((resolve, reject) => {
         chrome.runtime.sendMessage(
           {
@@ -51,15 +63,25 @@ class LatticeKeyringOffscreen extends LatticeKeyring {
             },
           },
           (response) => {
-            if (response.error) {
+            if (chrome.runtime.lastError) {
+              reject(chrome.runtime.lastError);
+              return;
+            }
+
+            if (response?.error) {
               reject(response.error);
+              return;
             }
 
-            resolve(response.result);
+            resolve(response?.result);
           },
         );
       });
 
+      if (!creds?.deviceID || !creds?.password) {
+        throw new Error('Invalid credentials returned from Lattice.');
+      }
+
       return creds;
       // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31973
       // eslint-disable-next-line @typescript-eslint/no-explicit-any

app/scripts/controllers/rewards/rewards-data-service.test.ts

@@ -34,7 +34,7 @@ buildTypes:
       - REJECT_INVALID_SNAPS_PLATFORM_VERSION: true
       - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/10.2.3/index.html
       - ACCOUNT_SNAPS_DIRECTORY_URL: https://snaps.metamask.io/account-management
-      - IS_SIDEPANEL: true
+      - IS_SIDEPANEL: false
       # for seedless onboarding (social login)
       - GOOGLE_PROD_CLIENT_ID
       - APPLE_PROD_CLIENT_ID
@@ -68,7 +68,7 @@ buildTypes:
       - REJECT_INVALID_SNAPS_PLATFORM_VERSION: true
       - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/10.2.3/index.html
       - ACCOUNT_SNAPS_DIRECTORY_URL: https://snaps.metamask.io/account-management
-      - IS_SIDEPANEL: true
+      - IS_SIDEPANEL: false
       # for seedless onboarding (social login)
       - GOOGLE_BETA_CLIENT_ID
       - APPLE_BETA_CLIENT_ID
@@ -137,7 +137,7 @@ buildTypes:
       - SEGMENT_WRITE_KEY_REF: SEGMENT_FLASK_WRITE_KEY
       - ACCOUNT_SNAPS_DIRECTORY_URL: https://metamask.github.io/snaps-directory-staging/main/account-management
       - EIP_4337_ENTRYPOINT: '0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789'
-      - IS_SIDEPANEL: true
+      - IS_SIDEPANEL: false
       # for seedless onboarding (social login)
       - GOOGLE_FLASK_CLIENT_ID
       - APPLE_FLASK_CLIENT_ID