Skip to content

Commit

Permalink
fix(wallet): ensure managed wallet is gone after logout
Browse files Browse the repository at this point in the history
  • Loading branch information
ygrishajev committed Sep 18, 2024
1 parent d01b8d5 commit a7d4873
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions apps/deploy-web/src/hooks/useManagedWallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,16 @@ import { useUser } from "@src/hooks/useUser";
import { useWhen } from "@src/hooks/useWhen";
import { useCreateManagedWalletMutation, useManagedWalletQuery } from "@src/queries/useManagedWalletQuery";
import networkStore from "@src/store/networkStore";
import {
deleteManagedWalletFromStorage,
ensureUserManagedWalletOwnership,
getSelectedStorageWallet,
getStorageManagedWallet,
updateStorageManagedWallet
} from "@src/utils/walletUtils";
import { deleteManagedWalletFromStorage, ensureUserManagedWalletOwnership, getSelectedStorageWallet, updateStorageManagedWallet } from "@src/utils/walletUtils";

const { NEXT_PUBLIC_MANAGED_WALLET_NETWORK_ID, NEXT_PUBLIC_BILLING_ENABLED } = browserEnvConfig;
const isBillingEnabled = NEXT_PUBLIC_BILLING_ENABLED;

const storedManagedWallet = getStorageManagedWallet();

export const useManagedWallet = () => {
const user = useUser();
const { data: queried, isFetched, isLoading: isFetching, refetch } = useManagedWalletQuery(isBillingEnabled ? user?.id : undefined);
const { mutate: create, data: created, isLoading: isCreating, isSuccess: isCreated } = useCreateManagedWalletMutation();
const wallet = useMemo(() => queried || storedManagedWallet || created, [queried, created]);
const wallet = useMemo(() => queried || created, [queried, created]);
const isLoading = isFetching || isCreating;
const [selectedNetworkId, setSelectedNetworkId] = useAtom(networkStore.selectedNetworkId);

Expand Down Expand Up @@ -69,7 +61,7 @@ export const useManagedWallet = () => {
wallet: wallet
? {
...wallet,
username: "username" in wallet ? wallet.username : wallet.name,
username: wallet.username,
isWalletConnected: isConfigured,
isWalletLoaded: isConfigured,
selected: selected?.address === wallet.address
Expand Down

0 comments on commit a7d4873

Please sign in to comment.