Merge branch 'develop' into dependabot/npm_and_yarn/develop/ledgerhq/hw-transport-webhid-6.30.0

Author: Comp0te

e2e-tests/constants.ts

@@ -1,4 +1,3 @@
-import { Page } from '@playwright/test';
 import path from 'path';
 
 export const newPassword = 'this is new password';
@@ -131,12 +130,12 @@ export const RPC_RESPONSE = {
     })
   },
   failure: {
-    status: 500,
+    status: 200,
     body: JSON.stringify({
-      sourceErr: {
+      error: {
         code: -32016,
-        data: 'error description',
-        message: 'error message'
+        data: 'Error description',
+        message: 'Error message'
       },
       id: 1,
       jsonrpc: '2.0'

e2e-tests/popup/transfers/casper-native-transfer.spec.ts

@@ -162,14 +162,10 @@ popup.describe('Popup UI: Casper Native Transfer', () => {
 
     await popupExpect(
       popupPage.getByRole('heading', {
-        name: 'failed to send http request, details: Code: 500, err: Internal Server Error'
+        name: 'Error message'
       })
     ).toBeVisible();
-    await popupExpect(
-      popupPage.getByText(
-        'Please check browser console for error details, this will be a valuable for our team to fix the issue.'
-      )
-    ).toBeVisible();
+    await popupExpect(popupPage.getByText('Error description')).toBeVisible();
 
     await popupPage.getByRole('button', { name: 'Close' }).click();
   });

e2e-tests/popup/transfers/erc-20-transfer.spec.ts

@@ -98,19 +98,8 @@ popup.describe('Popup UI: ERC-20 transfer', () => {
   popup('should made a failed transfer', async ({ unlockVault, popupPage }) => {
     await unlockVault();
 
-    await popupPage.route('https://node.testnet.cspr.cloud/rpc', route =>
-      route.fulfill({
-        status: 500,
-        body: JSON.stringify({
-          jsonrpc: '2.0',
-          id: 1717761373590,
-          error: {
-            code: '',
-            data: 'Error description',
-            message: 'Error message'
-          }
-        })
-      })
+    await popupPage.route(URLS.rpc, route =>
+      route.fulfill(RPC_RESPONSE.failure)
     );
 
     await new Promise(r => setTimeout(r, 5000));
@@ -191,14 +180,10 @@ popup.describe('Popup UI: ERC-20 transfer', () => {
 
     await popupExpect(
       popupPage.getByRole('heading', {
-        name: 'failed to send http request, details: Code: 500, err: Internal Server Error'
+        name: 'Error message'
       })
     ).toBeVisible();
-    await popupExpect(
-      popupPage.getByText(
-        'Please check browser console for error details, this will be a valuable for our team to fix the issue.'
-      )
-    ).toBeVisible();
+    await popupExpect(popupPage.getByText('Error description')).toBeVisible();
 
     await popupPage.getByRole('button', { name: 'Close' }).click();
   });

src/apps/connect-to-app/app-router.tsx

@@ -3,6 +3,8 @@ import { useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
 import { HashRouter, Route, Routes } from 'react-router-dom';
 
+import { ErrorMessages } from '@src/constants';
+
 import { ApproveConnectionPage } from '@connect-to-app/pages/approve-connection';
 import { ConnectingPage } from '@connect-to-app/pages/connecting';
 import { SelectAccountPage } from '@connect-to-app/pages/select-account';
@@ -87,7 +89,9 @@ function useSiteRelatedData() {
   const siteTitle = searchParams.get('title');
 
   if (origin == null) {
-    throw new Error('Missing origin search param');
+    throw new Error(
+      `${ErrorMessages.common.MISSING_SEARCH_PARAM.description} origin`
+    );
   }
 
   const connectWith = t('Connect with');

src/apps/connect-to-app/pages/approve-connection/index.tsx

@@ -3,6 +3,8 @@ import React from 'react';
 import { Trans } from 'react-i18next';
 import styled from 'styled-components';
 
+import { ErrorMessages } from '@src/constants';
+
 import { useAccountManager } from '@popup/hooks/use-account-actions-with-events';
 
 import { closeCurrentWindow } from '@background/close-current-window';
@@ -42,8 +44,9 @@ export function ApproveConnectionPage({
   const requestId = searchParams.get('requestId');
 
   if (!requestId) {
-    const error = Error(`Missing search param: ${requestId}`);
-    throw error;
+    throw Error(
+      `${ErrorMessages.common.MISSING_SEARCH_PARAM.description} ${requestId}`
+    );
   }
 
   const selectedAccountNamesLength = selectedAccountNames.length;

src/apps/connect-to-app/pages/select-account/index.tsx

@@ -3,6 +3,8 @@ import { Trans, useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
 import styled from 'styled-components';
 
+import { ErrorMessages } from '@src/constants';
+
 import { closeCurrentWindow } from '@background/close-current-window';
 import { selectIsActiveAccountConnectedWithActiveOrigin } from '@background/redux/vault/selectors';
 import { sendSdkResponseToSpecificTab } from '@background/send-sdk-response-to-specific-tab';
@@ -41,8 +43,9 @@ export function SelectAccountPage({
   const requestId = searchParams.get('requestId');
 
   if (!requestId) {
-    const error = Error(`Missing search param: ${requestId}`);
-    throw error;
+    throw Error(
+      `${ErrorMessages.common.MISSING_SEARCH_PARAM.description} ${requestId}`
+    );
   }
 
   const isActiveAccountConnected = useSelector(

src/apps/connect-to-app/pages/switch-account/index.tsx

@@ -1,5 +1,7 @@
 import React from 'react';
 
+import { ErrorMessages } from '@src/constants';
+
 import { closeCurrentWindow } from '@background/close-current-window';
 import { sendSdkResponseToSpecificTab } from '@background/send-sdk-response-to-specific-tab';
 
@@ -18,8 +20,9 @@ export function SwitchAccountPage() {
   const requestId = searchParams.get('requestId');
 
   if (!requestId) {
-    const error = Error(`Missing search param: ${requestId}`);
-    throw error;
+    throw Error(
+      `${ErrorMessages.common.MISSING_SEARCH_PARAM.description} ${requestId}`
+    );
   }
 
   const handleCancel = async () => {

src/apps/import-account-with-file/pages/import-account-with-file-failure/content.tsx

@@ -1,6 +1,8 @@
 import React from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
+import { ErrorMessages } from '@src/constants';
+
 import { useTypedLocation } from '@import-account-with-file/router';
 
 import {
@@ -27,15 +29,21 @@ export function ImportAccountWithFileFailureContentPage() {
       </IllustrationContainer>
       <ParagraphContainer top={SpacingSize.XL}>
         <Typography type="header">
-          <Trans t={t}>Something went wrong</Trans>
+          <Trans t={t}>
+            {
+              ErrorMessages.importAccountWithFile
+                .IMPORT_ACCOUNT_WITH_FILE_FAILED.message
+            }
+          </Trans>
         </Typography>
       </ParagraphContainer>
       <ParagraphContainer top={SpacingSize.Medium}>
         <Typography type="body" color="contentSecondary">
           {state?.importAccountStatusMessage
             ? state.importAccountStatusMessage
             : t(
-                ': We couldn’t import your account. Please confirm that you’re importing a file containing your secret key (not to be confused with your public key).'
+                ErrorMessages.importAccountWithFile
+                  .IMPORT_ACCOUNT_WITH_FILE_FAILED.description
               )}
         </Typography>
       </ParagraphContainer>

src/apps/import-account-with-file/pages/import-account-with-file-upload/hooks/use-secret-key-file-reader.ts

@@ -2,6 +2,8 @@ import { isError } from 'casper-wallet-core';
 import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { ErrorMessages } from '@src/constants';
+
 import { checkSecretKeyExist } from '@background/redux/import-account-actions-should-be-removed';
 
 import { parseSecretKeyString } from '@libs/crypto';
@@ -26,7 +28,7 @@ export function useSecretKeyFileReader({
       const isFileValid = (fileContents: string): Error | undefined => {
         if (!fileContents || fileContents.includes('PUBLIC KEY')) {
           return new Error(
-            t('A private key was not detected. Try importing a different file.')
+            t(ErrorMessages.secretKeyFile.INVALID_FILE_CONTENTS.description)
           );
         }
       };
@@ -38,7 +40,7 @@ export function useSecretKeyFileReader({
           secretKeyBase64 && (await checkSecretKeyExist(secretKeyBase64));
         if (existence) {
           return new Error(
-            t('This account already exists. Try importing a different file.')
+            t(ErrorMessages.secretKeyFile.ACCOUNT_EXISTS.description)
           );
         }
       };
@@ -77,9 +79,7 @@ export function useSecretKeyFileReader({
           return onFailure(
             isError(e)
               ? e.message
-              : t(
-                  'A private key was not detected. Try importing a different file.'
-                )
+              : t(ErrorMessages.secretKeyFile.PARSING_ERROR.description)
           );
         }
       };

src/apps/onboarding/pages/confirm-secret-phrase/index.tsx

@@ -2,6 +2,8 @@ import React, { useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { Navigate } from 'react-router-dom';
 
+import { ErrorMessages } from '@src/constants';
+
 import { Stepper } from '@onboarding/components/stepper';
 import { RouterPath } from '@onboarding/router';
 import { useTypedNavigate } from '@onboarding/router/use-typed-navigate';
@@ -45,16 +47,18 @@ export function ConfirmSecretPhrasePage({
         dispatchToMainStore(initVault({ secretPhrase: phrase }));
         navigate(RouterPath.ConfirmSecretPhraseSuccess);
       } else {
-        throw Error('Invalid secret phrase.');
+        throw Error(ErrorMessages.secretPhrase.INVALID_SECRET_PHRASE.message);
       }
     } catch (err) {
       console.error(err);
       navigate(
         ErrorPath,
         createErrorLocationState({
-          errorHeaderText: t("That's not the correct word order"),
+          errorHeaderText: t(
+            ErrorMessages.secretPhrase.WRONG_SECRET_PHRASE_ORDER.message
+          ),
           errorContentText: t(
-            'Please start over. Make sure you save your secret phrase as a text file or write it down somewhere.'
+            ErrorMessages.secretPhrase.WRONG_SECRET_PHRASE_ORDER.description
           ),
           errorPrimaryButtonLabel: t('Generate a new secret recovery phrase'),
           errorRedirectPath: RouterPath.CreateSecretPhraseConfirmation