♻️ split aliases by user address

marigold-dev · Mar 28, 2024 · 7acd1ac · 7acd1ac
1 parent cb5ec01
commit 7acd1ac
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/context/state.ts b/context/state.ts
@@ -10,7 +10,6 @@ import {
   Tzip16Module,
 } from "@taquito/tzip16";
 import BigNumber from "bignumber.js";
-import Router from "next/router";
 import { Context, createContext, Dispatch } from "react";
 import { contractStorage } from "../types/app";
 import { Trie } from "../utils/radixTrie";
@@ -30,6 +29,7 @@ type tezosState = {
   accountInfo: AccountInfo | null;
   contracts: { [address: string]: contractStorage };
   aliases: { [address: string]: string };
+  aliasesByUser: { [address: string]: { [addr: string]: string } };
   aliasTrie: Trie<string>;
   hasBanner: boolean;
   delegatorAddresses: string[] | undefined;
@@ -48,6 +48,7 @@ type tezosState = {
 type storage = {
   contracts: { [address: string]: contractStorage };
   aliases: { [address: string]: string };
+  aliasesByUser: { [address: string]: { [addr: string]: string } };
   importedWallets: {
     [address: string]: { [contractAddr: string]: contractStorage };
   };
@@ -90,6 +91,7 @@ let emptyState = (): tezosState => {
     proposalRefresher: 0,
     attemptedInitialLogin: false,
     importedWallets: {},
+    aliasesByUser: {},
   };
 };
 
@@ -159,7 +161,6 @@ type action =
     };
 
 const saveState = (state: tezosState) => {
-  console.log("state.currentContract", state.currentContract);
   const storage = JSON.parse(localStorage.getItem("app_state")!);
   localStorage.setItem(
     "app_state",
@@ -171,6 +172,9 @@ const saveState = (state: tezosState) => {
       importedWallets: storage
         ? { ...storage.importedWallets, ...state.importedWallets }
         : state.importedWallets,
+      aliasesByUser: storage
+        ? { ...storage.aliasesByUser, ...state.aliasesByUser }
+        : state.aliasesByUser,
     })
   );
 };
@@ -224,9 +228,7 @@ function reducer(state: tezosState, action: action): tezosState {
         [action.payload.address]: action.payload.contract,
       };
 
-      console.log("---- ", state, action);
-
-      const newState = {
+      const newState: tezosState = {
         ...state,
         contracts: contracts,
         aliases: aliases,
@@ -239,10 +241,12 @@ function reducer(state: tezosState, action: action): tezosState {
             [action.payload.address]: action.payload.contract,
           },
         },
+        aliasesByUser: {
+          ...state.aliasesByUser,
+          [state.address!]: aliases,
+        },
       };
 
-      console.warn(newState);
-
       saveState(newState);
 
       return newState;
@@ -336,24 +340,27 @@ function reducer(state: tezosState, action: action): tezosState {
               {}
             )
           : {};
-      // const currentContract = Object.keys(contracts).at(0) || null;
-      // if (currentContract) Router.push(`/${currentContract}/proposals`);
-      console.log("contracts", contracts);
+      const aliases =
+        storage?.aliasesByUser && storage.aliasesByUser[action.address]
+          ? storage.aliasesByUser[action.address]
+          : state.aliases;
+
+      const currentContract = Object.keys(contracts).at(0) || null;
       return {
         ...state,
         balance: action.balance,
         accountInfo: action.accountInfo,
         address: action.address,
         attemptedInitialLogin: true,
         contracts,
-        // currentContract,
-        // importedWallets: {...state.importedWallets, [action.address] : {}}
+        currentContract,
+        aliases,
       };
     }
     case "logout": {
       let { connection } = emptyState();
 
-      const newState = {
+      const newState: tezosState = {
         ...state,
         beaconWallet: null,
         balance: null,
@@ -363,6 +370,7 @@ function reducer(state: tezosState, action: action): tezosState {
         p2pClient: null,
         contracts: {},
         currentContract: null,
+        aliases: {},
       };
 
       saveState(newState);

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -55,7 +55,6 @@ export default function App({ Component, pageProps }: AppProps) {
 
     if ((path === "/" || path === "") && contracts.length > 0) {
       const contract = contracts[0];
-      console.log("🚀 ~ useEffect ~ contract:", contract);
 
       router.replace(`/${contract}/proposals`);
       return;
@@ -156,7 +155,6 @@ export default function App({ Component, pageProps }: AppProps) {
     state.currentStorage,
     state.connection,
   ]);
-  console.log("state", state);
   useEffect(() => {
     (async () => {
       if (state!.beaconWallet === null) {