fix: don't account for context.status

wevm · Jul 26, 2024 · 533a083 · 533a083
1 parent 36cdb8f
commit 533a083
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 22 deletions.
diff --git a/src/utils/getFrameContext.ts b/src/utils/getFrameContext.ts
@@ -60,12 +60,11 @@ export async function getFrameContext<
   const url = parsePath(reset ? `${origin}${initialPath}` : context.url)
 
   let previousState = await (async () => {
-    if (context.status === 'initial') {
-      if (typeof parameters.initialState === 'function')
-        return await (parameters.initialState as any)(contextHono)
-      return parameters.initialState
-    }
-    return context?.previousState
+    if (context.previousState) return context.previousState
+
+    if (typeof parameters.initialState === 'function')
+      return await (parameters.initialState as any)(contextHono)
+    return parameters.initialState
   })()
 
   function deriveState(

diff --git a/src/utils/getImageContext.ts b/src/utils/getImageContext.ts
@@ -39,17 +39,18 @@ export async function getImageContext<
 >(
   parameters: GetImageContextParameters<env, path, input, _state>,
 ): GetImageContextReturnType<env, path, input, _state> {
-  const { context, contextHono, initialState } = parameters
+  const { context, contextHono } = parameters
   const { env, previousState, req } = context || {}
 
   return {
     context: {
       env,
       previousState: await (async () => {
         if (previousState) return previousState
-        if (typeof initialState === 'function')
-          return await (initialState as any)(contextHono)
-        return initialState
+
+        if (typeof parameters.initialState === 'function')
+          return await (parameters.initialState as any)(contextHono)
+        return parameters.initialState
       })(),
       req,
       res: (data) => ({ data, format: 'image', status: 'success' }),

diff --git a/src/utils/getSignatureContext.ts b/src/utils/getSignatureContext.ts
@@ -52,12 +52,11 @@ export async function getSignatureContext<
   } = context || {}
 
   const previousState = await (async () => {
-    if (context?.previousState === undefined) {
-      if (typeof parameters.initialState === 'function')
-        return await (parameters.initialState as any)(contextHono)
-      return parameters.initialState
-    }
-    return context?.previousState
+    if (context.previousState) return context.previousState
+
+    if (typeof parameters.initialState === 'function')
+      return await (parameters.initialState as any)(contextHono)
+    return parameters.initialState
   })()
 
   const { buttonValue, inputText } = getIntentState({

diff --git a/src/utils/getTransactionContext.ts b/src/utils/getTransactionContext.ts
@@ -60,12 +60,11 @@ export async function getTransactionContext<
   } = context || {}
 
   const previousState = await (async () => {
-    if (context?.previousState === undefined) {
-      if (typeof parameters.initialState === 'function')
-        return await (parameters.initialState as any)(contextHono)
-      return parameters.initialState
-    }
-    return context.previousState
+    if (context.previousState) return context.previousState
+
+    if (typeof parameters.initialState === 'function')
+      return await (parameters.initialState as any)(contextHono)
+    return parameters.initialState
   })()
 
   const { buttonValue, inputText } = getIntentState({