Release 2023-11-21

packages/frontend/src/components/wallet-migration/WalletMigration.jsx

@@ -124,10 +124,7 @@ const WalletMigration = ({ open, onClose }) => {
         setIsLoggingOut(true);
         const failedAccounts = [];
         for (const accountId of availableAccounts) {
-            const publicKey = await wallet.getPublicKey(accountId);
             try {
-                const account = await wallet.getAccount(accountId);
-                await account.deleteKey(publicKey);
                 await wallet.removeWalletAccount(accountId);
             } catch {
                 failedAccounts.push(accountIdToHash(accountId));

packages/frontend/src/components/wallet-migration/modals/Disable2faModal/Disable2FA.jsx

@@ -140,7 +140,7 @@ const Disable2FAModal = ({ handleSetActiveView, onClose, accountWithDetails, set
 
     useEffect(() => {
         if (completedWithSuccess) {
-            handleSetActiveView(WALLET_MIGRATION_VIEWS.ROTATE_KEYS);
+            handleSetActiveView(WALLET_MIGRATION_VIEWS.MIGRATE_ACCOUNTS);
         }
     }, [completedWithSuccess]);
 

packages/frontend/src/components/wallet-migration/modals/WalletSelectorModal/WalletSelectorModal.jsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react';
 
+import { wallet } from '../../../../utils/wallet';
 import { WalletSelectorContent } from './WalletSelectorContent';
 import { ExportAccountSelectorContextProvider } from './WalletSelectorExportContext';
 
@@ -9,11 +10,7 @@ export const WalletSelectorModal = ({ onComplete, migrationAccounts, network, ro
         const init = async () => {
             const accountsWithKey = await Promise.all(migrationAccounts.map(async (account) => {
                 const accountId = account.accountId;
-                const privateKey = rotatedKeys[accountId];
-                if (!privateKey) {
-                    throw new Error('Unable to find a private key from the rotated keys');
-                }
-
+                const privateKey = await wallet.getLocalSecretKey(accountId);
                 return {
                     accountId,
                     privateKey,

packages/frontend/src/components/wallet/Wallet.js

@@ -24,9 +24,11 @@ import AllTokensTotalBalanceUSD from './AllTokensTotalBalanceUSD';
 import CreateCustomNameModal from './CreateCustomNameModal';
 import CreateFromImplicitSuccessModal from './CreateFromImplicitSuccessModal';
 import DepositNearBanner from './DepositNearBanner';
+import ExploreApps from './ExploreApps';
 import LinkDropSuccessModal from './LinkDropSuccessModal';
 import NFTs from './NFTs';
-import SidebarNearcon from './SidebarNearcon';
+import Sidebar from './Sidebar';
+import SidebarLight from './SidebarLight';
 import Tokens from './Tokens';
 import { ZeroBalanceAccountImportedModal } from './ZeroBalanceAccountImportedModal';
 
@@ -365,8 +367,11 @@ export function Wallet({
                     )}
                 </div>
                 <div className="right">
-                    {
-                        <SidebarNearcon/ >
+                    {isWhitelabel
+                        ? <SidebarLight availableAccounts={accountExists && availableAccounts} />
+                        : accountExists
+                            ? <Sidebar availableAccounts={availableAccounts} />
+                            : <ExploreApps />
                     }
                     <ActivitiesWrapper />
                 </div>