fix(swaps): getSwapStepRouteName util

components/swap/Preview.vue

@@ -156,15 +156,15 @@ const stepDetailsMap: Partial<Record<SwapStep, StepDetails>> = {
   [SwapStep.DESIRED]: {
     title: 'swap.yourSwapList',
     surchargeTitle: 'swap.requestToken',
-    nextRouteName: 'prefix-swap-id-offer',
-    backRouteName: 'prefix-swap',
+    nextRouteName: getSwapStepRouteName(SwapStep.OFFERED),
+    backRouteName: getSwapStepRouteName(SwapStep.COUNTERPARTY),
     surchargeDirection: 'Receive',
   },
   [SwapStep.OFFERED]: {
     title: 'swap.yourOffer',
     surchargeTitle: 'swap.addToken',
-    nextRouteName: 'prefix-swap-id-review',
-    backRouteName: 'prefix-swap-id',
+    nextRouteName: getSwapStepRouteName(SwapStep.REVIEW),
+    backRouteName: getSwapStepRouteName(SwapStep.DESIRED),
     surchargeDirection: 'Send',
   },
 }

middleware/swap.ts

@@ -1,37 +1,30 @@
-const ROUTE_NAME_STEP_MAP = {
-  'prefix-swap': SwapStep.COUNTERPARTY,
-  'prefix-swap-id': SwapStep.DESIRED,
-  'prefix-swap-id-offer': SwapStep.OFFERED,
-  'prefix-swap-id-review': SwapStep.REVIEW,
-}
-
 export default defineNuxtRouteMiddleware((to) => {
   const { toast } = useToast()
-  const atomicSwapsStore = useAtomicSwapsStore()
-  const { swap, items, step } = storeToRefs(atomicSwapsStore)
+  const swapStore = useAtomicSwapsStore()
+  const { swap, items, step } = storeToRefs(swapStore)
   const { urlPrefix } = usePrefix()
 
   const id = to.params.id?.toString()
   const routeName = to.name?.toString()
 
   if (!id || !routeName) {
-    return navigateTo({ name: ROUTE_NAME_STEP_MAP[SwapStep.COUNTERPARTY] })
+    return navigateTo({ name: getSwapStepRouteName(SwapStep.COUNTERPARTY) })
   }
 
-  step.value = ROUTE_NAME_STEP_MAP[routeName]
+  step.value = SWAP_ROUTE_NAME_STEP_MAP[routeName]
   swap.value = items.value
     .filter(item =>
       item.counterparty === id
       && item.urlPrefix === urlPrefix.value,
     ).sort((a, b) => b.createdAt - a.createdAt)[0]
 
-  if (to.name === ROUTE_NAME_STEP_MAP[SwapStep.DESIRED] && !swap.value) {
-    atomicSwapsStore.createSwap(id)
+  if (to.name === getSwapStepRouteName(SwapStep.DESIRED) && !swap.value) {
+    swapStore.createSwap(id)
     return
   }
 
   if (!swap.value) {
     toast('First select the NFTs you want to offer')
-    return navigateTo({ name: ROUTE_NAME_STEP_MAP[SwapStep.DESIRED], params: { id } })
+    return navigateTo({ name: getSwapStepRouteName(SwapStep.DESIRED), params: { id } })
   }
 })

utils/swaps.ts

@@ -0,0 +1,11 @@
+export const SWAP_ROUTE_NAME_STEP_MAP = {
+  'prefix-swap': SwapStep.COUNTERPARTY,
+  'prefix-swap-id': SwapStep.DESIRED,
+  'prefix-swap-id-offer': SwapStep.OFFERED,
+  'prefix-swap-id-review': SwapStep.REVIEW,
+}
+
+export const getSwapStepRouteName = (step: SwapStep) => {
+  const index = Object.values(SWAP_ROUTE_NAME_STEP_MAP).findIndex(name => name === step)
+  return Object.keys(SWAP_ROUTE_NAME_STEP_MAP)[index]
+}