Merge pull request #1125 from urbit/st/reset-store-logout

Clear state on logout
urbit · Oct 9, 2023 · ce4e43f · ce4e43f
2 parents 703ff86 + dbd3684
commit ce4e43f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/components/L2/Dropdowns/AccountsDropdown.tsx b/src/components/L2/Dropdowns/AccountsDropdown.tsx
@@ -1,7 +1,6 @@
 import { useCallback, useMemo, useState } from 'react';
 import { Icon, Row, Box } from '@tlon/indigo-react';
 import { Just } from 'folktale/maybe';
-
 import LayerIndicator from 'components/L2/LayerIndicator';
 import CopiableAddressWrap from 'components/copiable/CopiableAddressWrap';
 import { TooltipPosition } from 'components/WithTooltip';
@@ -26,7 +25,7 @@ const AccountsDropdown = ({ showMigrate = false }: AccountsDropdownProps) => {
   const walletInfo: any = useWallet();
   const { push, popTo, names, reset }: any = useHistory();
   const { setPointCursor }: any = usePointCursor();
-  const { point, pointList } = useRollerStore();
+  const { point, pointList, resetStore } = useRollerStore();
 
   const canBitcoin = Just.hasInstance(walletInfo.urbitWallet);
 
@@ -65,7 +64,8 @@ const AccountsDropdown = ({ showMigrate = false }: AccountsDropdownProps) => {
 
   const onLogout = () => {
     clearInvitesStorage();
-    reset();
+    reset(); // router
+    resetStore();
   };
 
   const hasL1Points = Boolean(pointList.find(({ layer }) => layer === 1));

diff --git a/src/store/rollerStore.ts b/src/store/rollerStore.ts
@@ -20,7 +20,7 @@ export const EMPTY_POINT = new Point({
   address: '',
 });
 
-export interface RollerStore {
+export interface RollerState {
   loading: boolean;
   nextQuotaTime: number;
   pendingTransactions: PendingTransaction[];
@@ -31,6 +31,9 @@ export interface RollerStore {
   modalText?: string;
   recentlyCompleted: number;
   ethBalance: BN;
+}
+
+export interface RollerActions {
   setLoading: (loading: boolean) => void;
   setModalText: (modalText: string) => void;
   setNextQuotaTime: (nextQuotaTime: number) => void;
@@ -41,9 +44,10 @@ export interface RollerStore {
   storePendingL1Txn: (txn: PendingL1Txn) => void;
   deletePendingL1Txn: (txn: PendingL1Txn) => void;
   setEthBalance: (ethBalance: BN) => void;
+  resetStore: () => void;
 }
 
-export const useRollerStore = create<RollerStore>(set => ({
+const initialRollerState: RollerState = {
   loading: false,
   nextQuotaTime: new Date().getTime() + 24 * HOUR,
   pendingTransactions: [],
@@ -53,6 +57,10 @@ export const useRollerStore = create<RollerStore>(set => ({
   pendingL1ByPoint: {},
   recentlyCompleted: 0,
   ethBalance: toBN(0),
+};
+
+export const useRollerStore = create<RollerState & RollerActions>(set => ({
+  ...initialRollerState,
   setLoading: (loading: boolean) => set(() => ({ loading })),
   setNextQuotaTime: (nextQuotaTime: number) => set(() => ({ nextQuotaTime })),
   setPendingTransactions: (pendingTransactions: PendingTransaction[]) =>
@@ -92,4 +100,7 @@ export const useRollerStore = create<RollerStore>(set => ({
       return { pendingL1ByPoint: newPending };
     }),
   setEthBalance: (ethBalance: BN) => set(() => ({ ethBalance })),
+  resetStore: () => {
+    set(initialRollerState);
+  },
 }));