@xyo-network/react-wallet 2.56.3 → 2.56.5

package/src/hooks/{useWallet.tsx → useWallet.ts}

@@ -4,20 +4,21 @@ import { DataLike } from '@xyo-network/core'
 import { WalletInstance } from '@xyo-network/wallet-model'
 import { useState } from 'react'
 
-import { useSelectedWalletAccount } from '../contexts'
+import { useSelectedWalletAccount, useWalletProvided } from '../contexts'
 
 export interface WalletHookParams {
   mnemonic?: string
   path?: string
   required?: boolean
   seed?: DataLike
-  wallet?: WalletInstance
+  wallet?: WalletInstance | null
 }
 
 export const useWallet = ({ mnemonic, wallet, path, required = false, seed }: WalletHookParams = {}): [
-  WalletInstance | undefined,
+  WalletInstance | null | undefined,
   Error | undefined,
 ] => {
+  const walletContextProvided = useWalletProvided()
   const [error, setError] = useState<Error>()
   const [contextAccount] = useSelectedWalletAccount(!wallet && required)
   const [activeAccount] = usePromise(async () => {
@@ -42,5 +43,5 @@ export const useWallet = ({ mnemonic, wallet, path, required = false, seed }: Wa
       setError(ex as Error)
     }
   }, [mnemonic, contextAccount, seed, path, wallet])
-  return [activeAccount, error]
+  return [activeAccount ?? (walletContextProvided ? null : activeAccount), error]
 }

package/src/hooks/{useWallets.tsx → useWallets.ts}

@@ -1,18 +1,20 @@
 import { usePromise } from '@xylabs/react-promise'
 import { WalletInstance } from '@xyo-network/wallet-model'
 
+import { useWalletProvided } from '../contexts'
 import { useWallet } from './useWallet'
 
 export interface WalletsHookParams {
   paths: string[]
-  wallet?: WalletInstance
+  wallet?: WalletInstance | null
 }
 
-export const useWallets = ({ wallet, paths }: WalletsHookParams): [WalletInstance[] | undefined, Error | undefined] => {
+export const useWallets = ({ wallet, paths }: WalletsHookParams): [WalletInstance[] | null | undefined, Error | undefined] => {
+  const walletContextProvided = useWalletProvided()
   const [foundWallet] = useWallet({ wallet })
   const [wallets, error] = usePromise(
     () => (foundWallet ? Promise.all(paths.map((path) => foundWallet.derivePath(path))) : undefined),
     [foundWallet, paths],
   )
-  return [wallets, error]
+  return [wallets ?? (walletContextProvided ? null : wallets), error]
 }

package/src/hooks/{useWrapperAccount.tsx → useWrapperAccount.ts}

@@ -1,4 +1,4 @@
-import { usePromise } from '@xylabs/react-promise'
+import { State as PromiseState, usePromise } from '@xylabs/react-promise'
 import { HDWallet } from '@xyo-network/account'
 import { AccountInstance } from '@xyo-network/account-model'
 import { WalletInstance } from '@xyo-network/wallet-model'
@@ -7,20 +7,28 @@ import { Mutex } from 'async-mutex'
 let globalWrapperWallet: WalletInstance | undefined = undefined
 const globalWrapperWalletMutex = new Mutex()
 
-export const useWrapperAccount = (account?: AccountInstance): AccountInstance | undefined => {
-  const [wallet] = usePromise(async () => {
+export const useWrapperAccount = (
+  account?: AccountInstance | null,
+): [AccountInstance | null | undefined, Error | undefined, PromiseState | undefined] => {
+  return usePromise(async () => {
     return await globalWrapperWalletMutex.runExclusive(async () => {
+      //if we are expecting to receive a wallet or did receive on, return the override account
+      if (account !== undefined) {
+        return account
+      }
+
       if (globalWrapperWallet) {
         return globalWrapperWallet
       }
+
       try {
         globalWrapperWallet = await HDWallet.random()
+        console.log(`Global Wrapper Wallet Creation Success: ${globalWrapperWallet.address}`)
       } catch (ex) {
         const error = ex as Error
-        console.error(`Wrapper Wallet Creation Failed: ${error.message}`)
+        console.error(`Global Wrapper Wallet Creation Failed: ${error.message}`)
       }
       return globalWrapperWallet
     })
-  }, [])
-  return account ?? wallet
+  }, [account])
 }