do not require state

1 files changed, 13 insertions, 13 deletions

diff --git a/packages/challenger-ui/src/hooks/session.ts b/packages/challenger-ui/src/hooks/session.ts
index a808697ea..86dfff94e 100644
--- a/packages/challenger-ui/src/hooks/session.ts
+++ b/packages/challenger-ui/src/hooks/session.ts
@@ -102,16 +102,14 @@ export function useSessionState(): SessionStateHandler {
       });
     },
     removeAddress(index) {
-      if (!state) throw Error("should have an state");
       const lastAddr = [...(state?.lastAddress ?? [])];
       lastAddr.splice(index, 1);
       update({
-        ...state,
+        completedURL: undefined,
         lastAddress: lastAddr,
       });
     },
     saveAddress(type, address) {
-      if (!state) throw Error("should have an state");
       const lastAddr = [...(state?.lastAddress ?? [])];
       lastAddr.push({
         type,
@@ -119,24 +117,26 @@ export function useSessionState(): SessionStateHandler {
         savedAt: AbsoluteTime.now(),
       });
       update({
-        ...state,
+        completedURL: undefined,
         lastAddress: lastAddr,
       });
     },
     sent(info) {
-      if (!state) throw Error("should have an state");
-      // instead of reloading state from server we can update client state
     },
     failed(info) {
-      if (!state) throw Error("should have an state");
-      // instead of reloading state from server we can update client state
     },
     completed(info) {
-      if (!state) throw Error("should have an state");
-      update({
-        ...state,
-        completedURL: info.redirect_url,
-      });
+      if (!state) {
+        update({
+          completedURL: info.redirect_url,
+          lastAddress: [],
+        });
+      } else {
+        update({
+          completedURL: info.redirect_url,
+          lastAddress: state.lastAddress,
+        });
+      }
     },
   };
 }