chore: release v1.742.0

src/assets/translations/en/main.json

@@ -1882,7 +1882,7 @@
         "importFromKeystore": "Import from keystore",
         "whatIsShapeshiftWallet": "What is ShapeShift Wallet?",
         "yourDecentralizedGateway": "Your decentralization gateway. Trade and earn Bitcoin, Ethereum, Solana and more from a single, secure wallet.",
-        "crossChainFreedom": "Cross chain freedom. Access the best rates across multiple decentralized exchanges, no middleman required",
+        "crossChainFreedom": "Cross chain freedom. Access the best rates across multiple decentralized exchanges, no middleman required.",
         "selfCustody": {
           "title": "Your ShapeShift Wallet is Self-Custody",
           "subTitle": "You hold the keys and you're the only one who can access it.",

src/context/WalletProvider/NewWalletViews/NewWalletViewsSwitch.tsx

@@ -11,9 +11,11 @@ import {
   useColorModeValue,
   useToast,
 } from '@chakra-ui/react'
+import { useQuery } from '@tanstack/react-query'
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { isMobile } from 'react-device-detect'
 import { useTranslate } from 'react-polyglot'
+import { reactQueries } from 'react-queries'
 import type { StaticContext } from 'react-router'
 import type { RouteComponentProps } from 'react-router-dom'
 import { Route, Switch, useHistory } from 'react-router-dom'
@@ -103,11 +105,17 @@ export const NewWalletViewsSwitch = () => {
       disconnectOnCloseModal,
       deviceState: { disposition },
       initialRoute,
+      nativeWalletPendingDeviceId,
     },
     dispatch,
     disconnect,
   } = useWallet()
 
+  const nativeVaultsQuery = useQuery({
+    ...reactQueries.common.hdwalletNativeVaultsList(),
+    refetchOnMount: true,
+  })
+
   const cancelWalletRequests = useCallback(async () => {
     await wallet?.cancel().catch(e => {
       console.error(e)
@@ -133,6 +141,9 @@ export const NewWalletViewsSwitch = () => {
 
   const handleRouteReset = useCallback(() => {
     history.replace(INITIAL_WALLET_MODAL_ROUTE)
+
+    setSelectedWalletId(null)
+    setError(null)
   }, [history])
 
   const onClose = useCallback(async () => {
@@ -161,8 +172,10 @@ export const NewWalletViewsSwitch = () => {
 
   const handleWalletSelect = useCallback(
     (walletId: string, _initialRoute: string) => {
-      setSelectedWalletId(walletId)
       if (_initialRoute) history.push(_initialRoute)
+
+      setSelectedWalletId(walletId)
+      setError(null)
     },
     [history],
   )
@@ -171,6 +184,13 @@ export const NewWalletViewsSwitch = () => {
     if (initialRoute) history.push(initialRoute)
   }, [history, initialRoute])
 
+  // Set the native wallet pending unlock as selected on refresh
+  useEffect(() => {
+    if (!(nativeWalletPendingDeviceId && nativeVaultsQuery.data)) return
+
+    setSelectedWalletId(nativeWalletPendingDeviceId)
+  }, [nativeVaultsQuery.data, nativeWalletPendingDeviceId])
+
   // Reset history on modal open/unmount
   useEffect(() => {
     if (!initialRoute) history.replace('/')
@@ -246,6 +266,7 @@ export const NewWalletViewsSwitch = () => {
                 size='sm'
                 isRound
                 position='static'
+                isDisabled={isLoading}
                 onClick={isConnectRoute ? handleRouteReset : handleBack}
               />
             </Box>

src/context/WalletProvider/WalletViewsRouter.tsx

@@ -1,6 +1,7 @@
 import { MemoryRouter } from 'react-router-dom'
 import { useFeatureFlag } from 'hooks/useFeatureFlag/useFeatureFlag'
 import { useWallet } from 'hooks/useWallet/useWallet'
+import { isMobile as isMobileApp } from 'lib/globals'
 
 import { NewWalletViewsSwitch } from './NewWalletViews/NewWalletViewsSwitch'
 import { WalletViewsSwitch } from './WalletViewsSwitch'
@@ -17,7 +18,7 @@ export const WalletViewsRouter = () => {
 
   return (
     <MemoryRouter initialIndex={0}>
-      {isNewWalletFlowEnabled ? <NewWalletViewsSwitch /> : <WalletViewsSwitch />}
+      {isNewWalletFlowEnabled && !isMobileApp ? <NewWalletViewsSwitch /> : <WalletViewsSwitch />}
     </MemoryRouter>
   )
 }