Merge remote-tracking branch 'origin/develop' into WALLET-421-cw-brin…

…gweb-3-integration

package.json

@@ -141,7 +141,7 @@
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-react-app": "^7.0.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-plugin-flowtype": "^8.0.3",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jsx-a11y": "^6.9.0",

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

@@ -134,7 +134,7 @@ export function SwitchAccountContent({ requestId }: SwitchAccountContentProps) {
               rows={connectedAccountsListItems}
               renderRow={(account, index) => {
                 const csprName =
-                  accountsInfo && accountsInfo[account.accountHash].csprName;
+                  accountsInfo && accountsInfo[account.accountHash]?.csprName;
 
                 return (
                   <ListItemContainer key={account.name}>

src/apps/connect-to-app/pages/switch-account/unconnected-accounts-list.tsx

@@ -69,7 +69,7 @@ export const UnconnectedAccountsList = ({
         renderRow={(unconnectedAccount, index) => {
           const csprName =
             accountsInfo &&
-            accountsInfo[unconnectedAccount.accountHash].csprName;
+            accountsInfo[unconnectedAccount.accountHash]?.csprName;
 
           return (
             <ListItemContainer key={unconnectedAccount.name}>

src/apps/import-account-with-file/index.tsx

@@ -1,3 +1,4 @@
+import { QueryClientProvider } from '@tanstack/react-query';
 import React, { Suspense, useState } from 'react';
 import { createRoot } from 'react-dom/client';
 import { Provider as ReduxProvider } from 'react-redux';
@@ -18,6 +19,7 @@ import { useSystemThemeDetector } from '@hooks/use-system-theme-detector';
 
 import '@libs/i18n/i18n';
 import { ErrorBoundary } from '@libs/layout';
+import { newQueryClient } from '@libs/services/query-client';
 import { GlobalStyle, darkTheme, lightTheme } from '@libs/ui';
 
 import { AppRouter } from './app-router';
@@ -57,9 +59,11 @@ const Tree = () => {
       <ThemeProvider theme={isDarkMode ? darkTheme : lightTheme}>
         <GlobalStyle />
         <ReduxProvider store={store}>
-          <ErrorBoundary>
-            <AppRouter />
-          </ErrorBoundary>
+          <QueryClientProvider client={newQueryClient}>
+            <ErrorBoundary>
+              <AppRouter />
+            </ErrorBoundary>
+          </QueryClientProvider>
         </ReduxProvider>
       </ThemeProvider>
     </Suspense>

src/apps/popup/constants.ts

@@ -8,12 +8,12 @@ export enum TimeoutDurationSetting {
 }
 
 export const MapTimeoutDurationSettingToValue = {
-  [TimeoutDurationSetting['1 min']]: 1,
-  [TimeoutDurationSetting['5 min']]: 5,
-  [TimeoutDurationSetting['15 min']]: 15,
-  [TimeoutDurationSetting['30 min']]: 30,
-  [TimeoutDurationSetting['1 hour']]: 60,
-  [TimeoutDurationSetting['24 hours']]: 60 * 24
+  [TimeoutDurationSetting['1 min']]: 1000 * 60 * 1,
+  [TimeoutDurationSetting['5 min']]: 1000 * 60 * 5,
+  [TimeoutDurationSetting['15 min']]: 1000 * 60 * 15,
+  [TimeoutDurationSetting['30 min']]: 1000 * 60 * 30,
+  [TimeoutDurationSetting['1 hour']]: 1000 * 60 * 60,
+  [TimeoutDurationSetting['24 hours']]: 1000 * 60 * 60 * 24
 };
 
 export const LOCK_VAULT_TIMEOUT = 1000 * 60 * 5;