fix conflict

app/(private)/layout.tsx

@@ -2,8 +2,8 @@
 
 import ForgeActive from '@/app/(private)/assets/force-active.png'
 import ForgeInactive from '@/app/(private)/assets/force-inactive.png'
-import JackpotActive from '@/app/(private)/assets/jackpot-active.png'
-import JackpotInactive from '@/app/(private)/assets/jackpot-inactive.png'
+import RedeemActive from '@/app/(private)/assets/redeem-active.png'
+import RedeemInactive from '@/app/(private)/assets/redeem-inactive.png'
 import QuestActive from '@/app/(private)/assets/quest-active.png'
 import QuestInactive from '@/app/(private)/assets/quest-inactive.png'
 import Active from '@/app/(private)/assets/active-tab.png'
@@ -40,6 +40,7 @@ export default function Layout({ children }: { children: ReactNode }) {
       <div className='flex md:flex-col gap-4 items-center justify-center md:justify-normal'>
         <div
           className='cursor-pointer'
+          id='screen_forge'
           onClick={() => {
             router.push('/')
           }}>
@@ -57,27 +58,33 @@ export default function Layout({ children }: { children: ReactNode }) {
         </div>
         <div
           className='cursor-pointer'
+          id='screen_redeem'
           onClick={() => {
-            router.push('/wish')
+            router.push('/redeem')
           }}>
           <div className='relative md:hidden cursor-pointer'>
-            <Image src={pathname == '/wish' ? Active : Inactive} alt='' className={`w-[106px]`} />
+            <Image src={pathname == '/redeem' ? Active : Inactive} alt='' className={`w-[106px]`} />
             <div
               className={`${Bangkok.className} absolute inset-0 grid place-items-center ${
-                pathname == '/wish' ? 'text-[#FFB438]' : 'text-[#828282]'
+                pathname == '/redeem' ? 'text-[#FFB438]' : 'text-[#828282]'
               }`}>
-              <div className=''>Wish</div>
+              <div className='capitalize'>redeem</div>
             </div>
           </div>
-          <Image src={JackpotActive} alt='' className={` hidden w-[157px] ${pathname == '/wish' ? 'md:block' : ''}`} />{' '}
           <Image
-            src={JackpotInactive}
+            src={RedeemActive}
             alt=''
-            className={` hidden w-[112px] ${pathname != '/wish' ? 'md:block' : ''}`}
+            className={` hidden w-[157px] ${pathname == '/redeem' ? 'md:block' : ''}`}
+          />{' '}
+          <Image
+            src={RedeemInactive}
+            alt=''
+            className={` hidden w-[112px] ${pathname != '/redeem' ? 'md:block' : ''}`}
           />
         </div>
         <div
           className='cursor-pointer'
+          id='screen_quests'
           onClick={() => {
             router.push('/quests')
           }}>

app/(private)/page.tsx

@@ -23,38 +23,8 @@ import TopBar2 from './assets/top-bar-2.svg'
 import TopBar from './assets/top-bar.svg'
 import TopBarMobile from './assets/top-bar_mobile.svg'
 import { RevealForgingResult } from './components/revealForgingResult'
-import { Token } from '@/model/token'
-const initList = {
-  w1: 0,
-  w2: 0,
-  w3: 0,
-  w4: 0,
-  w5: 0,
-  w6: 0,
-  w7: 0,
-  b1: 0,
-  b2: 0,
-  b3: 0,
-  b4: 0,
-  b5: 0,
-  b6: 0,
-  b7: 0,
-  g1: 0,
-  g2: 0,
-  g3: 0,
-  g4: 0,
-  g5: 0,
-  g6: 0,
-  g7: 0,
-  r1: 0,
-  r2: 0,
-  r3: 0,
-  r4: 0,
-  r5: 0,
-  r6: 0,
-  r7: 0,
-  shield: 0,
-}
+import { initList } from '@/constants'
+
 export default function Home() {
   const config = getConfig()
   const { assets, lastAssetsUpdate, fetchAssets, setBlackListId } = useContext(Context)
@@ -188,6 +158,7 @@ export default function Home() {
         bl.push(shield?.token_id)
       }
       setTempBlackList(bl)
+      console.log('forge', main, material, shield)
       const client = await getSigningCosmWasmClient()
       await client.executeMultiple(
         address as string,
@@ -212,7 +183,6 @@ export default function Home() {
           : undefined
       )
 
-      console.log('forge', main, material, shield)
       if (result?.data?.data?.requestId) {
         setRequestId(result?.data?.data?.requestId)
         console.log('revealing request id:', result?.data?.data?.requestId)
@@ -428,6 +398,7 @@ export default function Home() {
               </div>
               <div className='mt-4 w-fit mx-auto'>
                 <FilledButton
+                  id='action_forge'
                   isLoading={loading}
                   onClick={forgeGemHandler}
                   disabled={!mainGem || !materialGems.find((g) => g)?.length}>