feat(wallet): fix wallet locking

palladians · Dec 13, 2023 · be8c281 · be8c281
1 parent 1eed257
commit be8c281
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/packages/features/src/common/components/CommandMenu.tsx b/packages/features/src/common/components/CommandMenu.tsx
@@ -21,13 +21,16 @@ import {
 import React from 'react'
 import { useNavigate } from 'react-router-dom'
 
+import { useAccount } from '../hooks/useAccount'
+
 interface CommandMenuProps {
   open: boolean
   setOpen: (open: boolean) => void
 }
 
 export const CommandMenu = ({ open, setOpen }: CommandMenuProps) => {
   const navigate = useNavigate()
+  const { lockWallet } = useAccount()
 
   const COMMAND_GROUPS = [
     {
@@ -105,7 +108,7 @@ export const CommandMenu = ({ open, setOpen }: CommandMenuProps) => {
         {
           name: 'Lock Wallet',
           icon: LockIcon,
-          onSelect: () => console.log('not yet'),
+          onSelect: lockWallet,
           testId: 'commandMenu__lockWallet'
         }
       ]

diff --git a/packages/features/src/common/hooks/useAccount.ts b/packages/features/src/common/hooks/useAccount.ts
@@ -1,13 +1,16 @@
 import { Mina } from '@palladxyz/mina-core'
+import { getSessionPersistence } from '@palladxyz/persistence'
 import { useToast } from '@palladxyz/ui'
 import { useVault } from '@palladxyz/vault'
 import easyMeshGradient from 'easy-mesh-gradient'
 import { useMemo } from 'react'
+import { useNavigate } from 'react-router-dom'
 import useSWR from 'swr'
 
 import { useAppStore } from '../store/app'
 
 export const useAccount = () => {
+  const navigate = useNavigate()
   const { toast } = useToast()
   const currentWallet = useVault((state) => state.getCurrentWallet())
   const getAccountInfo = useVault((state) => state.getAccountInfo)
@@ -43,11 +46,17 @@ export const useAccount = () => {
       title: 'Wallet address was copied.'
     })
   }
+  const lockWallet = async () => {
+    await getSessionPersistence().setItem('spendingPassword', '')
+    await useVault.persist.rehydrate()
+    return navigate('/unlock')
+  }
   return {
     ...swr,
     minaBalance,
     gradientBackground,
     copyWalletAddress,
-    publicKey
+    publicKey,
+    lockWallet
   }
 }
diff --git a/packages/features/src/overview/components/AvatarMenu.tsx b/packages/features/src/overview/components/AvatarMenu.tsx
@@ -12,7 +12,7 @@ import { useNavigate } from 'react-router-dom'
 import { useAccount } from '../../common/hooks/useAccount'
 
 export const AvatarMenu = () => {
-  const { gradientBackground } = useAccount()
+  const { gradientBackground, lockWallet } = useAccount()
   const navigate = useNavigate()
   return (
     <DropdownMenu>
@@ -31,7 +31,7 @@ export const AvatarMenu = () => {
           <SettingsIcon className="mr-2 h-4 w-4" />
           <span>Settings</span>
         </DropdownMenuItem>
-        <DropdownMenuItem onClick={() => console.log('not yet')}>
+        <DropdownMenuItem onClick={lockWallet}>
           <LockIcon className="mr-2 h-4 w-4" />
           <span>Lock Wallet</span>
         </DropdownMenuItem>

diff --git a/packages/mina-graphql/test/provider.test.ts b/packages/mina-graphql/test/provider.test.ts
@@ -24,7 +24,7 @@ describe('Provider', () => {
     expect(response.delegate).toBeDefined()
     expect(response.publicKey).toBeDefined()
   })
-  test('getAccountInfo (mainnet)', async () => {
+  test.skip('getAccountInfo (mainnet)', async () => {
     const args: AccountInfoArgs = {
       publicKey: 'B62qkAqbeE4h1M5hop288jtVYxK1MsHVMMcBpaWo8qdsAztgXaHH1xq' // this must be a public key that doesn't exist yet on mainnet
     }

diff --git a/packages/vault/test/wallet/walletFlow.test.ts b/packages/vault/test/wallet/walletFlow.test.ts
@@ -1,6 +1,7 @@
 import {
   constructTransaction,
   FromBip39MnemonicWordsProps,
+  GroupedCredentials,
   MinaPayload,
   MinaSpecificArgs,
   Network
@@ -184,7 +185,7 @@ describe('WalletTest', () => {
     // get key agent
     const instance = keyAgent1?.keyAgent
     const signedTx = await instance!.sign(
-      groupedCredential?.credential,
+      groupedCredential?.credential as GroupedCredentials,
       constructedTx,
       args
     )