Merge branch 'main' into fix/added-support-link-unlock-ui

Author: smgv

app/_locales/en/messages.json

@@ -764,6 +764,7 @@ export enum MetaMetricsEventName {
   NavPermissionsOpened = 'Permissions Opened',
   NetworkConnectionBannerShown = 'Network Connection Banner Shown',
   NetworkConnectionBannerUpdateRpcClicked = 'Network Connection Banner Update RPC Clicked',
+  NetworkConnectionBannerRpcUpdated = 'Network Connection Banner RPC Updated',
   UpdatePermissionedNetworks = 'Update Permissioned Networks',
   UpdatePermissionedAccounts = 'Update Permissioned Accounts',
   ViewPermissionedNetworks = 'View Permissioned Networks',

app/_locales/en_GB/messages.json

@@ -5,7 +5,7 @@ export default new Route({
   pathname: '/predict',
   getTitle: (_: URLSearchParams) => 'deepLink_thePredictPage',
   handler: function handler(params: URLSearchParams) {
-    const predictUrl = new URL('/predict', BaseUrl.MetaMask);
+    const predictUrl = new URL('/prediction-markets', BaseUrl.MetaMask);
     params.forEach((value, key) => predictUrl.searchParams.append(key, value));
     return {
       redirectTo: predictUrl,

shared/constants/metametrics.ts

@@ -252,3 +252,43 @@ export const mockSwapConfirmation = {
     ],
   },
 };
+
+export const mockBridgeQuotes = [
+  {
+    quote: {
+      requestId:
+        '0xb7e0cdb746800056208ae5408a1755d9c8c10970c067a5e1fbbe768d2f6f626c',
+      bridgeId: '0x',
+      srcChainId: 42161,
+      destChainId: 42161,
+      aggregator: 'openocean',
+      aggregatorType: 'AGG',
+      srcTokenAmount: '9913',
+      destTokenAmount: '11104',
+      minDestTokenAmount: '10881',
+      walletAddress: '0x178239802520a9C99DCBD791f81326B70298d629',
+      destWalletAddress: '0x178239802520a9C99DCBD791f81326B70298d629',
+      bridges: ['0x'],
+      protocols: ['0x'],
+      steps: [],
+      slippage: 2,
+    },
+    approval: {
+      chainId: 42161,
+      to: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
+      from: '0x178239802520a9C99DCBD791f81326B70298d629',
+      value: '0x0',
+      data: '0x1234567890abcdef',
+      gasLimit: 63109,
+    },
+    trade: {
+      chainId: 42161,
+      to: '0x9dDA6Ef3D919c9bC8885D5560999A3640431e8e6',
+      from: '0x178239802520a9C99DCBD791f81326B70298d629',
+      value: '0x0',
+      data: '0x1234567890abcdef',
+      gasLimit: 596053,
+    },
+    estimatedProcessingTimeInSeconds: 0,
+  },
+];

shared/lib/deep-links/routes/predict.ts

@@ -274,15 +274,19 @@ and we'll take you to the right place.`
         // test signed flow
         await driver.openNewURL(signedUrl);
 
-        await driver.waitForUrl({ url: `${BaseUrl.MetaMask}/predict` });
+        await driver.waitForUrl({
+          url: `${BaseUrl.MetaMask}/prediction-markets`,
+        });
 
         await driver.navigate();
         await homePage.checkPageIsLoaded();
 
         // test unsigned flow
         await driver.openNewURL(rawUrl);
 
-        await driver.waitForUrl({ url: `${BaseUrl.MetaMask}/predict` });
+        await driver.waitForUrl({
+          url: `${BaseUrl.MetaMask}/prediction-markets`,
+        });
       },
     );
   });

test/data/confirmations/contract-interaction.ts

@@ -1039,6 +1039,7 @@
     "seasonStatusError": "null",
     "seasonStatusLoading": "boolean",
     "rewardsEnabled": "boolean",
+    "rewardsBadgeHidden": "boolean",
     "errorToast": {
       "actionText": "string",
       "description": "string",

test/e2e/tests/deep-link/deep-link.spec.ts

@@ -105,7 +105,10 @@ describe('NetworkConnectionBanner', () => {
         );
         fireEvent.click(getByText('Update RPC'));
 
-        expect(mockSetEditedNetwork).toHaveBeenCalledWith({ chainId: '0x1' });
+        expect(mockSetEditedNetwork).toHaveBeenCalledWith({
+          chainId: '0x1',
+          trackRpcUpdateFromBanner: true,
+        });
         expect(navigateMock).toHaveBeenCalledWith('/settings/networks');
       });
 
@@ -212,7 +215,10 @@ describe('NetworkConnectionBanner', () => {
         );
         fireEvent.click(getByText('update RPC'));
 
-        expect(mockSetEditedNetwork).toHaveBeenCalledWith({ chainId: '0x1' });
+        expect(mockSetEditedNetwork).toHaveBeenCalledWith({
+          chainId: '0x1',
+          trackRpcUpdateFromBanner: true,
+        });
         expect(navigateMock).toHaveBeenCalledWith('/settings/networks');
       });
 

test/e2e/tests/settings/state-logs.json

@@ -190,7 +190,12 @@ export const NetworkConnectionBanner = () => {
         networkClientId: networkConnectionBanner.networkClientId,
       });
 
-      dispatch(setEditedNetwork({ chainId: networkConnectionBanner.chainId }));
+      dispatch(
+        setEditedNetwork({
+          chainId: networkConnectionBanner.chainId,
+          trackRpcUpdateFromBanner: true,
+        }),
+      );
       navigate(NETWORKS_ROUTE);
     }
   }, [networkConnectionBanner, dispatch, navigate]);

ui/components/app/network-connection-banner/network-connection-banner.test.tsx

@@ -11,6 +11,7 @@ import {
   Display,
   FlexDirection,
   BlockSize,
+  JustifyContent,
 } from '../../../helpers/constants/design-system';
 import { ONBOARDING_REVEAL_SRP_ROUTE } from '../../../helpers/constants/routes';
 import {
@@ -62,15 +63,18 @@ export default function RecoveryPhraseReminder({ onConfirm }) {
           </Box>
         </ModalHeader>
         <ModalBody>
-          <Box width={BlockSize.Full} textAlign={TextAlign.Center}>
+          <Box
+            width={BlockSize.Full}
+            display={Display.Flex}
+            alignItems={AlignItems.center}
+            justifyContent={JustifyContent.center}
+            marginBottom={2}
+          >
             <img
               src="images/forgot-password-lock.png"
-              width={154}
-              height={154}
+              width={100}
+              height={100}
               alt={t('recoveryPhraseReminderTitle')}
-              style={{
-                alignSelf: 'center',
-              }}
             />
           </Box>
           <Text>{t('recoveryPhraseReminderSubText')}</Text>