diff --git a/apps/portal/app/components/create-claim/create-claim-form.tsx b/apps/portal/app/components/create-claim/create-claim-form.tsx
index 2b61f7d49..b236b3612 100644
--- a/apps/portal/app/components/create-claim/create-claim-form.tsx
+++ b/apps/portal/app/components/create-claim/create-claim-form.tsx
@@ -8,7 +8,6 @@ import {
   DialogTitle,
   Icon,
   Input,
-  Label,
   Text,
   toast,
 } from '@0xintuition/1ui'
@@ -18,13 +17,6 @@ import { IdentityPopover } from '@components/create-claim/create-claim-popovers'
 import CreateClaimReview from '@components/create-claim/create-claim-review'
 import { InfoTooltip } from '@components/info-tooltip'
 import WrongNetworkButton from '@components/wrong-network-button'
-import {
-  getFormProps,
-  getInputProps,
-  SubmissionResult,
-  useForm,
-} from '@conform-to/react'
-import { parseWithZod } from '@conform-to/zod'
 import { multivaultAbi } from '@lib/abis/multivault'
 import { useCreateTriple } from '@lib/hooks/useCreateTriple'
 import { useGetWalletBalance } from '@lib/hooks/useGetWalletBalance'
@@ -35,12 +27,12 @@ import {
   transactionReducer,
   useTransactionState,
 } from '@lib/hooks/useTransactionReducer'
-import { createClaimSchema } from '@lib/schemas/create-claim-schema'
 import { createClaimModalAtom } from '@lib/state/store'
 import { getChainEnvConfig } from '@lib/utils/environment'
 import logger from '@lib/utils/logger'
 import { useFetcher, useNavigate } from '@remix-run/react'
 import { CreateClaimLoaderData } from '@routes/resources+/create-claim'
+import { GetClaimLoaderData } from '@routes/resources+/get-claim'
 import { TagLoaderData } from '@routes/resources+/tag'
 import {
   CREATE_CLAIM_RESOURCE_ROUTE,
@@ -57,10 +49,9 @@ import {
   TransactionSuccessActionType,
 } from 'app/types/transaction'
 import { useAtomValue } from 'jotai'
-import { parseUnits } from 'viem'
-import { useAccount, usePublicClient, useWalletClient } from 'wagmi'
+import { Address, decodeEventLog, parseUnits } from 'viem'
+import { useAccount, usePublicClient } from 'wagmi'
 
-import ErrorList from '../error-list'
 import { TransactionState } from '../transaction-state'
 
 interface ClaimFormProps {
@@ -81,9 +72,6 @@ export function ClaimForm({
     TransactionActionType
   >(transactionReducer, initialTransactionState)
 
-  const [transactionResponseData, setTransactionResponseData] =
-    useState<ClaimPresenter | null>(null)
-
   const isTransactionStarted = [
     'approve',
     'awaiting',
@@ -122,8 +110,6 @@ export function ClaimForm({
           onClose={onClose}
           onSuccess={onSuccess}
           successAction={successAction}
-          setTransactionResponseData={setTransactionResponseData}
-          transactionResponseData={transactionResponseData}
         />
       </div>
     </div>
@@ -134,10 +120,6 @@ interface CreateClaimFormProps {
   wallet: string
   state: TransactionStateType
   dispatch: React.Dispatch<TransactionActionType>
-  setTransactionResponseData: React.Dispatch<
-    React.SetStateAction<ClaimPresenter | null>
-  >
-  transactionResponseData: ClaimPresenter | null
   onSuccess?: (claim: ClaimPresenter) => void
   successAction?: TransactionSuccessActionType
   onClose: () => void
@@ -147,26 +129,22 @@ function CreateClaimForm({
   wallet,
   state,
   dispatch,
-  setTransactionResponseData,
-  transactionResponseData,
   onClose,
-  onSuccess,
   successAction = TransactionSuccessAction.VIEW,
 }: CreateClaimFormProps) {
   const { subject, predicate, object } = useAtomValue(createClaimModalAtom)
   const feeFetcher = useLoaderFetcher<CreateClaimLoaderData>(
     CREATE_CLAIM_RESOURCE_ROUTE,
   )
+  const claimChecker = useFetcher<TagLoaderData>()
+  const claimFetcher = useFetcher<GetClaimLoaderData>()
+
   const { fees } = (feeFetcher.data as CreateClaimLoaderData) ?? {}
 
+  const [lastTxHash, setLastTxHash] = useState<string | undefined>(undefined)
   const [initialDeposit, setInitialDeposit] = useState<string>('0')
-
+  const [vaultId, setVaultId] = useState<string | undefined>(undefined)
   const navigate = useNavigate()
-  interface OffChainClaimFetcherData {
-    success: 'success' | 'error'
-    claim: ClaimPresenter
-    submission: SubmissionResult<string[]> | null
-  }
 
   // const [searchQuery, setSearchQuery] = useState('')
   const [isSubjectPopoverOpen, setIsSubjectPopoverOpen] = useState(false)
@@ -176,7 +154,6 @@ function CreateClaimForm({
 
   const { setSearchQuery, identities, handleInput } = useIdentityServerSearch()
 
-  const { data: walletClient } = useWalletClient()
   const publicClient = usePublicClient()
   const { address, chain } = useAccount()
 
@@ -184,6 +161,7 @@ function CreateClaimForm({
     writeContractAsync: writeCreateTriple,
     awaitingWalletConfirmation,
     awaitingOnChainConfirmation,
+    receipt: txReceipt,
   } = useCreateTriple()
 
   // form
@@ -224,11 +202,30 @@ function CreateClaimForm({
             hash: txHash,
           })
 
-          dispatch({
-            type: 'TRANSACTION_COMPLETE',
-            txHash,
-            txReceipt: receipt,
-          })
+          type EventLogArgs = {
+            sender: Address
+            receiver?: Address
+            owner?: Address
+            vaultId: string
+          }
+
+          if (
+            receipt?.logs[0].data &&
+            receipt?.transactionHash !== lastTxHash
+          ) {
+            const decodedLog = decodeEventLog({
+              abi: multivaultAbi,
+              data: receipt?.logs[0].data,
+              topics: receipt?.logs[0].topics,
+            })
+
+            const topics = decodedLog as unknown as {
+              eventName: string
+              args: EventLogArgs
+            }
+            setVaultId(topics.args.vaultId.toString())
+            setLastTxHash(receipt.transactionHash)
+          }
         }
       } catch (error) {
         console.error('error', error)
@@ -252,90 +249,51 @@ function CreateClaimForm({
     }
   }
 
-  const claimFetcher = useFetcher<OffChainClaimFetcherData>()
-  const lastOffChainSubmission = claimFetcher.data?.submission
+  useEffect(() => {
+    if (txReceipt && vaultId) {
+      claimFetcher.load(`/resources/get-claim?vaultId=${vaultId}`)
+    }
+  }, [txReceipt, vaultId])
 
   useEffect(() => {
-    if (
-      claimFetcher.state === 'idle' &&
-      claimFetcher.data !== null &&
-      claimFetcher.data !== undefined
-    ) {
-      const responseData = claimFetcher.data as OffChainClaimFetcherData
-      if (responseData !== null) {
-        setTransactionResponseData(responseData.claim)
-        logger('responseData', responseData)
-        if (
-          responseData.claim !== undefined &&
-          selectedIdentities.subject !== null &&
-          selectedIdentities.predicate !== null &&
-          selectedIdentities.object !== null
-        ) {
-          handleOnChainCreateTriple({
-            subjectVaultId: selectedIdentities.subject.vault_id,
-            predicateVaultId: selectedIdentities.predicate.vault_id,
-            objectVaultId: selectedIdentities.object.vault_id,
-          })
-        }
-      }
-      if (claimFetcher.data === null || claimFetcher.data === undefined) {
-        console.error('Error in offchain data creation.:', claimFetcher.data)
+    if (txReceipt) {
+      if (claimFetcher.data && 'claim' in claimFetcher.data) {
+        console.log('claimFetcher.data', claimFetcher.data)
+        dispatch({
+          type: 'TRANSACTION_COMPLETE',
+          txHash: txReceipt.transactionHash,
+          txReceipt,
+        })
+      } else if (claimFetcher.data && 'error' in claimFetcher.data) {
+        const errorMessage = `Your claim was created, but we're having trouble fetching its details. Vault ID: ${vaultId}`
         dispatch({
           type: 'TRANSACTION_ERROR',
-          error: 'Error in offchain claim creation.',
+          error: errorMessage,
         })
+        toast.error(errorMessage)
       }
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [claimFetcher.state, claimFetcher.data, dispatch])
+  }, [claimFetcher.data, txReceipt, vaultId])
 
-  const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
-    event.preventDefault()
+  const handleSubmit = async () => {
     try {
+      dispatch({ type: 'CONFIRM_TRANSACTION' })
       if (
-        walletClient &&
-        selectedIdentities.subject &&
-        selectedIdentities.predicate &&
-        selectedIdentities.object
+        selectedIdentities.subject !== null &&
+        selectedIdentities.predicate !== null &&
+        selectedIdentities.object !== null
       ) {
-        const formData = new FormData()
-        formData.append('subject_id', selectedIdentities.subject.id)
-        formData.append('predicate_id', selectedIdentities.predicate.id)
-        formData.append('object_id', selectedIdentities.object.id)
-        const submission = parseWithZod(formData, {
-          schema: createClaimSchema,
+        handleOnChainCreateTriple({
+          subjectVaultId: selectedIdentities.subject.vault_id,
+          predicateVaultId: selectedIdentities.predicate.vault_id,
+          objectVaultId: selectedIdentities.object.vault_id,
         })
-
-        if (event.currentTarget.initial_deposit?.value !== undefined) {
-          setInitialDeposit(event.currentTarget.initial_deposit.value)
-        }
-
-        logger('submission', submission)
-
-        if (
-          submission.status === 'error' &&
-          submission.error !== null &&
-          Object.keys(submission.error).length
-        ) {
-          console.error('Create claim validation errors: ', submission.error)
-        }
-        claimFetcher.submit(formData, {
-          action: '/actions/create-claim',
-          method: 'post',
-        })
-        dispatch({ type: 'CONFIRM_TRANSACTION' })
       }
     } catch (error: unknown) {
       logger(error)
     }
   }
 
-  const [form, fields] = useForm({
-    id: 'create-claim',
-    lastResult: lastOffChainSubmission,
-    onSubmit: async (event) => handleSubmit(event),
-  })
-
   const [selectedIdentities, setSelectedIdentities] = useState<{
     subject: IdentityPresenter | null
     predicate: IdentityPresenter | null
@@ -380,8 +338,6 @@ function CreateClaimForm({
     address ?? (wallet as `0x${string}`),
   )
 
-  const claimChecker = useFetcher<TagLoaderData>()
-
   useEffect(() => {
     if (
       selectedIdentities.subject &&
@@ -404,14 +360,6 @@ function CreateClaimForm({
     }
   }, [claimChecker.data, selectedIdentities])
 
-  useEffect(() => {
-    if (state.status === 'complete') {
-      if (transactionResponseData) {
-        onSuccess?.(transactionResponseData)
-      }
-    }
-  }, [state.status, transactionResponseData])
-
   const Divider = () => (
     <span className="h-px w-2.5 flex bg-border/30 self-end mb-[1.2rem] max-sm:hidden" />
   )
@@ -420,12 +368,6 @@ function CreateClaimForm({
 
   return (
     <>
-      <claimFetcher.Form
-        method="post"
-        {...getFormProps(form)}
-        action="/actions/create-claim"
-        hidden
-      />
       <div className="h-full flex flex-col">
         {state.status === 'idle' ? (
           <div className="flex flex-col items-center justify-between h-full">
@@ -478,9 +420,6 @@ function CreateClaimForm({
                   <div className="flex w-full max-w-md flex-col mx-auto">
                     <div className="flex flex-row items-center justify-between mb-1">
                       <div className="inline-flex gap-1">
-                        <Label htmlFor={fields.initial_deposit.id} hidden>
-                          Initial Deposit
-                        </Label>
                         <div className="self-stretch flex-col justify-start items-start flex">
                           <div className="flex w-full items-center justify-between gap-1">
                             <Text
@@ -502,9 +441,6 @@ function CreateClaimForm({
                       </Badge>
                     </div>
                     <Input
-                      {...getInputProps(fields.initial_deposit, {
-                        type: 'text',
-                      })}
                       placeholder="0"
                       startAdornment="ETH"
                       value={initialDeposit}
@@ -524,10 +460,6 @@ function CreateClaimForm({
                         setInitialDeposit(sanitizedValue)
                       }}
                     />
-                    <ErrorList
-                      id={fields.initial_deposit.errorId}
-                      errors={fields.initial_deposit.errors}
-                    />
                   </div>
                 </div>
               </div>
@@ -573,8 +505,7 @@ function CreateClaimForm({
                 <WrongNetworkButton />
               ) : (
                 <Button
-                  form={form.id}
-                  type="submit"
+                  onClick={handleSubmit}
                   variant="primary"
                   disabled={
                     !address ||
@@ -599,16 +530,14 @@ function CreateClaimForm({
               txHash={state.txHash}
               type="claim"
               successButton={
-                transactionResponseData && (
+                txReceipt && (
                   <Button
                     type="button"
                     variant="primary"
                     className="w-40"
                     onClick={() => {
                       if (successAction === TransactionSuccessAction.VIEW) {
-                        navigate(
-                          `${PATHS.CLAIM}/${transactionResponseData.claim_id}`,
-                        )
+                        navigate(`${PATHS.CLAIM}/${vaultId}`)
                       }
 
                       onClose()
@@ -626,7 +555,14 @@ function CreateClaimForm({
                   variant="primary"
                   className="mt-auto w-40"
                   onClick={() => {
-                    dispatch({ type: 'START_TRANSACTION' })
+                    if (txReceipt) {
+                      dispatch({ type: 'TRANSACTION_PENDING' })
+                      claimFetcher.load(
+                        `/resources/get-claim?vaultId=${vaultId}`,
+                      )
+                    } else {
+                      dispatch({ type: 'START_TRANSACTION' })
+                    }
                   }}
                 >
                   Retry
diff --git a/apps/portal/app/components/create-identity/create-identity-form.tsx b/apps/portal/app/components/create-identity/create-identity-form.tsx
index 33e4442bd..f09838bac 100644
--- a/apps/portal/app/components/create-identity/create-identity-form.tsx
+++ b/apps/portal/app/components/create-identity/create-identity-form.tsx
@@ -869,7 +869,7 @@ function CreateIdentityForm({
                     onClick={() => {
                       if (successAction === TransactionSuccessAction.VIEW) {
                         navigate(
-                          `${PATHS.IDENTITY}/${transactionResponseData.id}`,
+                          `${PATHS.IDENTITY}/${transactionResponseData.vault_id}`,
                         )
                       }
                       handleClose()
diff --git a/apps/portal/app/components/detail-info-card.tsx b/apps/portal/app/components/detail-info-card.tsx
index f87663773..636739de1 100644
--- a/apps/portal/app/components/detail-info-card.tsx
+++ b/apps/portal/app/components/detail-info-card.tsx
@@ -66,7 +66,7 @@ const DetailInfoCard = ({
             List
           </Text>
           <div className="flex justify-start items-center gap-1">
-            <a href={getListUrl(list.claim_id, '', readOnly)}>
+            <a href={getListUrl(list.vault_id, '', readOnly)}>
               <IdentityTag
                 variant={list.object?.user ? Identity.user : Identity.nonUser}
                 imgSrc={list.object?.image ?? ''}
diff --git a/apps/portal/app/components/list/active-positions-on-claims.tsx b/apps/portal/app/components/list/active-positions-on-claims.tsx
index 4a1c52efb..5c17af332 100644
--- a/apps/portal/app/components/list/active-positions-on-claims.tsx
+++ b/apps/portal/app/components/list/active-positions-on-claims.tsx
@@ -67,7 +67,7 @@ export function ActivePositionsOnClaims({
               )
             }
             feesAccrued={0} // TODO: Update once BE adds deltas to the data output
-            link={getClaimUrl(claim.claim_id, readOnly)}
+            link={getClaimUrl(claim.vault_id, readOnly)}
           >
             <Claim
               size="md"
diff --git a/apps/portal/app/components/list/activity.tsx b/apps/portal/app/components/list/activity.tsx
index be9d59236..25459682d 100644
--- a/apps/portal/app/components/list/activity.tsx
+++ b/apps/portal/app/components/list/activity.tsx
@@ -228,7 +228,7 @@ function ActivityItem({
                 +formatBalance(activity.claim.against_assets_sum, 18)
               }
               tvl={+formatBalance(activity.claim.assets_sum, 18)}
-              link={`${PATHS.CLAIM}/${activity.claim.claim_id}`}
+              link={`${PATHS.CLAIM}/${activity.claim.vault_id}`}
               className="w-full hover:bg-transparent pr-0"
             >
               <Claim
diff --git a/apps/portal/app/components/list/claims.tsx b/apps/portal/app/components/list/claims.tsx
index c63f58bd4..472ce382d 100644
--- a/apps/portal/app/components/list/claims.tsx
+++ b/apps/portal/app/components/list/claims.tsx
@@ -77,7 +77,7 @@ export function ClaimsList({
             claimsForValue={+formatBalance(claim.for_assets_sum, 18)}
             claimsAgainstValue={+formatBalance(claim.against_assets_sum, 18)}
             tvl={+formatBalance(claim.assets_sum, 18)}
-            link={getClaimUrl(claim.claim_id, readOnly)}
+            link={getClaimUrl(claim.vault_id, readOnly)}
           >
             <Claim
               size="md"
diff --git a/apps/portal/app/components/list/list-claims.tsx b/apps/portal/app/components/list/list-claims.tsx
index 70c230861..65aaba318 100644
--- a/apps/portal/app/components/list/list-claims.tsx
+++ b/apps/portal/app/components/list/list-claims.tsx
@@ -71,6 +71,7 @@ export function ListClaimsList<T extends SortColumnType = ClaimSortColumn>({
     object: claim.object,
     user_assets_for: claim.user_assets_for,
     claim_id: claim.claim_id,
+    vault_id: claim.vault_id,
   }))
 
   const listContainerRef = useRef<HTMLDivElement>(null)
@@ -116,14 +117,14 @@ export function ListClaimsList<T extends SortColumnType = ClaimSortColumn>({
                   isSaved={claim.user_assets_for !== '0'}
                   savedAmount={claim.user_assets_for}
                   navigateLink={getListUrl(
-                    claim.claim_id,
+                    claim.vault_id,
                     sourceUserAddress ?? '',
                     readOnly,
                   )}
                   onViewClick={() =>
                     navigate(
                       getListUrl(
-                        claim.claim_id,
+                        claim.vault_id,
                         sourceUserAddress ?? '',
                         readOnly,
                       ),
diff --git a/apps/portal/app/components/list/tags.tsx b/apps/portal/app/components/list/tags.tsx
index 2d1e6fc92..4d9a03bc1 100644
--- a/apps/portal/app/components/list/tags.tsx
+++ b/apps/portal/app/components/list/tags.tsx
@@ -28,7 +28,6 @@ import { SortOption } from '../sort-select'
 import { List } from './list'
 
 export function TagsList({
-  identities,
   claims,
   tag,
   pagination,
@@ -38,7 +37,6 @@ export function TagsList({
   enableSort = true,
   readOnly = false,
 }: {
-  identities: IdentityPresenter[]
   claims: ClaimPresenter[]
   claim: ClaimPresenter
   tag?: IdentityPresenter | null
@@ -61,18 +59,6 @@ export function TagsList({
 
   const setSaveListModalActive = useSetAtom(saveListModalAtom)
 
-  const claimMap = new Map(
-    claims
-      .filter(
-        (
-          claim,
-        ): claim is ClaimPresenter & {
-          subject: NonNullable<ClaimPresenter['subject']>
-        } => claim.subject !== null,
-      )
-      .map((claim) => [claim.subject.id, claim.claim_id]),
-  )
-
   return (
     <>
       <List<SortColumn>
@@ -91,41 +77,32 @@ export function TagsList({
             ]}
           />
         )}
-        {identities.map((identity) => {
-          if (!identity || typeof identity !== 'object') {
-            return null
-          }
-
-          const claimId = claimMap.get(identity.id)
-          const matchingClaim = claims.find(
-            (claim) => claim.claim_id === claimId,
-          )
+        {claims.map((claim) => {
+          const identity = claim.subject
           // TODO: ENG-0000: Show filled save if user has a position on claim
           // TODO: ENG-0000: Show only user position if user is on filtering by you.
 
           return (
             <div
-              key={identity.id}
+              key={claim.claim_id}
               className={`grow shrink basis-0 self-stretch bg-background first:border-t-px first:rounded-t-xl last:rounded-b-xl theme-border border-t-0 flex-col justify-start hover:bg-secondary/10 transition-colors duration-200 items-start gap-5 inline-flex`}
             >
               <div className="flex flex-row gap-2 w-full">
                 <IdentityRow
-                  variant={identity.is_user ? Identity.user : Identity.nonUser}
+                  variant={identity?.is_user ? Identity.user : Identity.nonUser}
                   avatarSrc={getAtomImage(identity)}
                   name={getAtomLabel(identity)}
                   description={getAtomDescription(identity)}
-                  id={identity.user?.wallet ?? identity.identity_id}
-                  claimLink={getClaimUrl(claimId ?? '', readOnly)}
+                  id={identity?.user?.wallet ?? identity?.identity_id ?? ''}
+                  claimLink={getClaimUrl(claim.vault_id ?? '', readOnly)}
                   tags={
-                    identity.tags?.map((tag) => ({
+                    identity?.tags?.map((tag) => ({
                       label: tag.display_name,
                       value: tag.num_tagged_identities,
                     })) ?? undefined
                   }
-                  amount={
-                    +formatBalance(BigInt(matchingClaim?.assets_sum || 0), 18)
-                  }
-                  totalFollowers={matchingClaim?.num_positions || 0}
+                  amount={+formatBalance(BigInt(claim?.assets_sum || 0), 18)}
+                  totalFollowers={claim?.num_positions || 0}
                   link={getAtomLink(identity, readOnly)}
                   ipfsLink={getAtomIpfsLink(identity)}
                   className={`w-full hover:bg-transparent ${readOnly ? '' : 'pr-0'}`}
@@ -137,11 +114,11 @@ export function TagsList({
                     onClick={() => {
                       setSaveListModalActive({
                         isOpen: true,
-                        id: identity.vault_id,
+                        id: claim.vault_id,
                         identity,
                         tag:
                           tag &&
-                          identity.tags?.find(
+                          identity?.tags?.find(
                             (t) => t.vault_id === tag.vault_id,
                           ),
                       })
diff --git a/apps/portal/app/components/save-list/save-button.tsx b/apps/portal/app/components/save-list/save-button.tsx
index 1d714e0cb..f4b512276 100644
--- a/apps/portal/app/components/save-list/save-button.tsx
+++ b/apps/portal/app/components/save-list/save-button.tsx
@@ -1,7 +1,6 @@
 import { useEffect, useState } from 'react'
 
 import { Button, cn } from '@0xintuition/1ui'
-import { IdentityPresenter } from '@0xintuition/api'
 
 import { saveListModalAtom } from '@lib/state/store'
 import { getChainEnvConfig } from '@lib/utils/environment'
@@ -23,7 +22,7 @@ interface SaveButtonProps {
   handleClose: () => void
   dispatch: (action: TransactionActionType) => void
   state: TransactionStateType
-  identity: IdentityPresenter
+  vaultId: string
   min_deposit: string
   walletBalance: string
   conviction_price: string
@@ -40,7 +39,7 @@ const SaveButton: React.FC<SaveButtonProps> = ({
   handleClose,
   dispatch,
   state,
-  identity,
+  vaultId,
   min_deposit,
   walletBalance,
   conviction_price,
@@ -74,7 +73,7 @@ const SaveButton: React.FC<SaveButtonProps> = ({
       state.status === 'transaction-confirmed' ||
       state.status === 'complete'
     ) {
-      return 'View identity'
+      return 'View Claim'
     } else if (state.status === 'error') {
       return 'Retry'
     } else if (chain?.id !== getChainEnvConfig(CURRENT_ENV).chainId) {
@@ -116,11 +115,7 @@ const SaveButton: React.FC<SaveButtonProps> = ({
           state.status === 'transaction-confirmed'
         ) {
           handleClose()
-          navigate(
-            identity.is_user
-              ? `${PATHS.PROFILE}/${identity.identity_id}`
-              : `${PATHS.IDENTITY}/${identity.id}`,
-          )
+          navigate(`${PATHS.CLAIM}/${vaultId}`)
         } else if (state.status === 'review-transaction') {
           handleAction()
         } else if (chain?.id !== getChainEnvConfig(CURRENT_ENV).chainId) {
diff --git a/apps/portal/app/components/save-list/save-form.tsx b/apps/portal/app/components/save-list/save-form.tsx
index b927696cc..aaffabe16 100644
--- a/apps/portal/app/components/save-list/save-form.tsx
+++ b/apps/portal/app/components/save-list/save-form.tsx
@@ -32,7 +32,6 @@ import SaveReview from './save-review'
 interface SaveFormProps {
   tag: IdentityPresenter | TagEmbeddedPresenter
   identity: IdentityPresenter
-  claimId?: string | null
   user_assets: string
   entry_fee: string
   exit_fee: string
diff --git a/apps/portal/app/components/save-list/save-list-modal.tsx b/apps/portal/app/components/save-list/save-list-modal.tsx
index 52ae38d90..791291f40 100644
--- a/apps/portal/app/components/save-list/save-list-modal.tsx
+++ b/apps/portal/app/components/save-list/save-list-modal.tsx
@@ -14,22 +14,17 @@ import { useDepositTriple } from '@lib/hooks/useDepositTriple'
 import { useGetWalletBalance } from '@lib/hooks/useGetWalletBalance'
 import { useRedeemTriple } from '@lib/hooks/useRedeemTriple'
 import { transactionReducer } from '@lib/hooks/useTransactionReducer'
-import { getSpecialPredicate } from '@lib/utils/app'
+import { saveListModalAtom } from '@lib/state/store'
 import logger from '@lib/utils/logger'
 import { useGenericTxState } from '@lib/utils/use-tx-reducer'
 import { useFetcher, useLocation } from '@remix-run/react'
-import { ClaimLoaderData } from '@routes/resources+/search-claims-by-ids'
-import {
-  CURRENT_ENV,
-  GET_VAULT_DETAILS_RESOURCE_ROUTE,
-  MIN_DEPOSIT,
-  SEARCH_CLAIMS_BY_IDS_RESOURCE_ROUTE,
-} from 'app/consts'
+import { GET_VAULT_DETAILS_RESOURCE_ROUTE, MIN_DEPOSIT } from 'app/consts'
 import {
   TransactionActionType,
   TransactionStateType,
 } from 'app/types/transaction'
 import { VaultDetailsType } from 'app/types/vault'
+import { useAtomValue } from 'jotai'
 import { Abi, Address, decodeEventLog, formatUnits, parseUnits } from 'viem'
 import { useAccount, usePublicClient } from 'wagmi'
 
@@ -95,50 +90,16 @@ export default function SaveListModal({
     reset,
   } = mode === 'save' ? depositHook : redeemHook
 
-  const [fetchedClaimVaultId, setFetchedClaimVaultId] = useState<string | null>(
-    null,
-  )
-  const [fetchedClaimId, setFetchedClaimId] = useState<string | null>(null)
   const [vaultDetails, setVaultDetails] = useState<VaultDetailsType>()
-
-  const claimFetcher = useFetcher<ClaimLoaderData[]>()
   const vaultDetailsFetcher = useFetcher<VaultDetailsType>()
 
-  useEffect(() => {
-    let isCancelled = false
-
-    if (identity && tag) {
-      const fetchClaim = () => {
-        const searchParams = new URLSearchParams({
-          subject: identity.vault_id,
-          predicate:
-            getSpecialPredicate(CURRENT_ENV).tagPredicate.vaultId?.toString(),
-          object: tag.vault_id,
-          fetchId: fetchId.toString(),
-        })
-
-        const finalUrl = `${SEARCH_CLAIMS_BY_IDS_RESOURCE_ROUTE}?${searchParams.toString()}`
-
-        if (!isCancelled) {
-          claimFetcher.load(finalUrl)
-        }
-      }
-
-      fetchClaim()
-    }
-
-    return () => {
-      isCancelled = true
-    }
-    // omits the fetcher from the exhaustive deps
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [identity, tag, fetchId])
+  const { id: vaultId } = useAtomValue(saveListModalAtom)
 
   useEffect(() => {
     let isCancelled = false
 
-    if (fetchedClaimVaultId !== null) {
-      const finalUrl = `${GET_VAULT_DETAILS_RESOURCE_ROUTE}?contract=${contract}&vaultId=${fetchedClaimVaultId}&fetchId=${fetchId}`
+    if (vaultId !== null) {
+      const finalUrl = `${GET_VAULT_DETAILS_RESOURCE_ROUTE}?contract=${contract}&vaultId=${vaultId}&fetchId=${fetchId}`
       if (!isCancelled) {
         vaultDetailsFetcher.load(finalUrl)
       }
@@ -149,47 +110,13 @@ export default function SaveListModal({
     }
     // omits the fetcher from the exhaustive deps
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [contract, fetchedClaimVaultId, fetchId])
+  }, [contract, vaultId, fetchId])
 
   useEffect(() => {
-    if (
-      claimFetcher.state === 'loading' ||
-      vaultDetailsFetcher.state === 'loading'
-    ) {
+    if (vaultDetailsFetcher.state === 'loading') {
       setIsLoading(true)
     }
-  }, [claimFetcher.state, vaultDetailsFetcher.state])
-
-  useEffect(() => {
-    if (
-      claimFetcher.state === 'idle' &&
-      claimFetcher.data &&
-      Array.isArray(claimFetcher.data) &&
-      claimFetcher.data.length > 0
-    ) {
-      logger('claimFetcher.data[0]', claimFetcher.data[0])
-      const fetchedClaimResponse = claimFetcher.data[0] as unknown as {
-        claim_id: string
-        vault_id: string
-      }
-      if (fetchedClaimResponse && fetchedClaimResponse.vault_id) {
-        setFetchedClaimVaultId(fetchedClaimResponse.vault_id)
-      } else {
-        setFetchedClaimVaultId(null)
-      }
-
-      if (fetchedClaimResponse && fetchedClaimResponse.claim_id) {
-        setFetchedClaimId(fetchedClaimResponse.claim_id)
-      } else {
-        setFetchedClaimId(null)
-      }
-    } else if (
-      claimFetcher.state === 'idle' &&
-      (!claimFetcher.data || claimFetcher.data.length === 0)
-    ) {
-      setFetchedClaimVaultId(null)
-    }
-  }, [claimFetcher.state, claimFetcher.data])
+  }, [vaultDetailsFetcher.state])
 
   useEffect(() => {
     if (vaultDetailsFetcher.state === 'idle' && vaultDetailsFetcher.data) {
@@ -201,7 +128,7 @@ export default function SaveListModal({
   const useHandleAction = (actionType: string) => {
     return async () => {
       try {
-        if (!contract || !fetchedClaimVaultId || !vaultDetails) {
+        if (!contract || !vaultId || !vaultDetails) {
           throw new Error('Missing required parameters')
         }
         const txHash = await writeContractAsync({
@@ -211,11 +138,11 @@ export default function SaveListModal({
             actionType === 'save' ? 'depositTriple' : 'redeemTriple',
           args:
             actionType === 'save'
-              ? [userWallet as `0x${string}`, fetchedClaimVaultId]
+              ? [userWallet as `0x${string}`, vaultId]
               : [
                   vaultDetails.user_conviction,
                   userWallet as `0x${string}`,
-                  fetchedClaimVaultId,
+                  vaultId,
                 ],
           value:
             actionType === 'save'
@@ -387,15 +314,12 @@ export default function SaveListModal({
   const handleClose = () => {
     onClose()
     setMode('save')
-    setFetchedClaimVaultId(null)
     setVaultDetails(undefined)
     setIsLoading(true)
     setVal(formattedMinDeposit ?? MIN_DEPOSIT)
     setShowErrors(false)
     setValidationErrors([])
-    claimFetcher.data = undefined
     vaultDetailsFetcher.data = undefined
-    claimFetcher.state = 'idle'
     vaultDetailsFetcher.state = 'idle'
     setFetchId((prevId) => prevId + 1)
     setTimeout(() => {
@@ -407,15 +331,12 @@ export default function SaveListModal({
   useEffect(() => {
     if (open) {
       setMode('save')
-      setFetchedClaimVaultId(null)
       setVaultDetails(undefined)
       setIsLoading(true)
       setVal(formattedMinDeposit ?? MIN_DEPOSIT)
       setShowErrors(false)
       setValidationErrors([])
-      claimFetcher.data = undefined
       vaultDetailsFetcher.data = undefined
-      claimFetcher.state = 'idle'
       vaultDetailsFetcher.state = 'idle'
       setFetchId((prevId) => prevId + 1)
       dispatch({ type: 'START_TRANSACTION' })
@@ -429,7 +350,7 @@ export default function SaveListModal({
     'confirm',
   ].includes(state.status)
 
-  return (
+  return vaultId ? (
     <Dialog
       defaultOpen
       open={open}
@@ -445,7 +366,6 @@ export default function SaveListModal({
           <SaveForm
             tag={tag}
             identity={identity}
-            claimId={fetchedClaimId}
             user_assets={vaultDetails?.user_assets ?? '0'}
             entry_fee={vaultDetails?.formatted_entry_fee ?? '0'}
             exit_fee={vaultDetails?.formatted_exit_fee ?? '0'}
@@ -479,7 +399,7 @@ export default function SaveListModal({
                   handleClose={handleClose}
                   dispatch={dispatch}
                   state={state}
-                  identity={identity}
+                  vaultId={vaultId}
                   user_conviction={vaultDetails?.user_conviction ?? '0'}
                   className={`${(vaultDetails?.user_conviction && vaultDetails?.user_conviction > '0' && state.status === 'idle') || mode !== 'save' ? '' : 'hidden'}`}
                 />
@@ -490,7 +410,7 @@ export default function SaveListModal({
                   handleClose={handleClose}
                   dispatch={dispatch}
                   state={state}
-                  identity={identity}
+                  vaultId={vaultId}
                   min_deposit={vaultDetails?.min_deposit ?? '0'}
                   walletBalance={walletBalance}
                   conviction_price={vaultDetails?.conviction_price ?? '0'}
@@ -505,5 +425,5 @@ export default function SaveListModal({
         </DialogFooter>
       </DialogContent>
     </Dialog>
-  )
+  ) : null
 }
diff --git a/apps/portal/app/components/save-list/unsave-button.tsx b/apps/portal/app/components/save-list/unsave-button.tsx
index b1c8869a3..2a014e9af 100644
--- a/apps/portal/app/components/save-list/unsave-button.tsx
+++ b/apps/portal/app/components/save-list/unsave-button.tsx
@@ -1,7 +1,6 @@
 import { useEffect, useState } from 'react'
 
 import { Button, cn } from '@0xintuition/1ui'
-import { IdentityPresenter } from '@0xintuition/api'
 
 import { saveListModalAtom } from '@lib/state/store'
 import { getChainEnvConfig } from '@lib/utils/environment'
@@ -20,7 +19,7 @@ interface UnsaveButtonProps {
   handleClose: () => void
   dispatch: (action: TransactionActionType) => void
   state: TransactionStateType
-  identity: IdentityPresenter
+  vaultId: string
   user_conviction: string
   className?: string
 }
@@ -31,7 +30,7 @@ const UnsaveButton: React.FC<UnsaveButtonProps> = ({
   handleClose,
   dispatch,
   state,
-  identity,
+  vaultId,
   user_conviction,
   className,
 }) => {
@@ -56,7 +55,7 @@ const UnsaveButton: React.FC<UnsaveButtonProps> = ({
       state.status === 'transaction-confirmed' ||
       state.status === 'complete'
     ) {
-      return 'View identity'
+      return 'View Claim'
     } else if (state.status === 'error') {
       return 'Retry'
     } else if (chain?.id !== getChainEnvConfig(CURRENT_ENV).chainId) {
@@ -98,11 +97,7 @@ const UnsaveButton: React.FC<UnsaveButtonProps> = ({
           state.status === 'transaction-confirmed'
         ) {
           handleClose()
-          navigate(
-            identity.is_user
-              ? `${PATHS.PROFILE}/${identity.identity_id}`
-              : `${PATHS.IDENTITY}/${identity.id}`,
-          )
+          navigate(`${PATHS.CLAIM}/${vaultId}`)
         } else if (state.status === 'review-transaction') {
           handleAction()
         } else if (chain?.id !== getChainEnvConfig(CURRENT_ENV).chainId) {
diff --git a/apps/portal/app/components/tags/tags-form.tsx b/apps/portal/app/components/tags/tags-form.tsx
index ca8d62d5c..aac033f85 100644
--- a/apps/portal/app/components/tags/tags-form.tsx
+++ b/apps/portal/app/components/tags/tags-form.tsx
@@ -222,7 +222,7 @@ export function TagsForm({
                     navigate(
                       identity.is_user
                         ? `${PATHS.PROFILE}/${identity.identity_id}`
-                        : `${PATHS.IDENTITY}/${identity.id}`,
+                        : `${PATHS.IDENTITY}/${identity.vault_id}`,
                     )
 
                     onClose()
diff --git a/apps/portal/app/lib/services/claims.ts b/apps/portal/app/lib/services/claims.ts
index 55bb46edb..a0b39e8bb 100644
--- a/apps/portal/app/lib/services/claims.ts
+++ b/apps/portal/app/lib/services/claims.ts
@@ -1,11 +1,9 @@
 import {
-  ApiError,
   ClaimPresenter,
   ClaimSortColumn,
   ClaimsService,
 } from '@0xintuition/api'
 
-import logger from '@lib/utils/logger'
 import { getStandardPageParams } from '@lib/utils/params'
 import { fetchWrapper } from '@server/api'
 
@@ -47,32 +45,13 @@ export async function getClaimsAboutIdentity({
   }
 }
 
-export async function getClaimOrPending(
+export async function getClaim(
   request: Request,
   id: string,
-): Promise<{ claim?: ClaimPresenter | null; isPending: boolean }> {
-  try {
-    const claim = await fetchWrapper(request, {
-      method: ClaimsService.getClaimById,
-      args: { id },
-    })
-    return { claim, isPending: false }
-  } catch (error) {
-    if (error instanceof ApiError && error.status === 404) {
-      try {
-        logger('IDENTITY IS 404')
-        const pendingClaim = (await fetchWrapper(request, {
-          method: ClaimsService.pendingClaimById,
-          args: { id },
-        })) as unknown as ClaimPresenter // we're handling the missing identity properties via not rendering anything that relies on any missing properties. otherwise we'd need to set defaults which i'm wary of
-        logger(`CLAIM ${id} IS PENDING`)
-        logger('pendingClaim', pendingClaim)
-        return { claim: pendingClaim, isPending: true }
-      } catch (pendingError) {
-        logger('catching pendingError')
-        return { claim: null, isPending: false }
-      }
-    }
-    throw error
-  }
+): Promise<{ claim?: ClaimPresenter | null }> {
+  const claim = await fetchWrapper(request, {
+    method: ClaimsService.getClaimById,
+    args: { id },
+  })
+  return { claim }
 }
diff --git a/apps/portal/app/lib/services/lists.ts b/apps/portal/app/lib/services/lists.ts
index e0207a71a..ed4ca3d99 100644
--- a/apps/portal/app/lib/services/lists.ts
+++ b/apps/portal/app/lib/services/lists.ts
@@ -2,7 +2,6 @@ import {
   ClaimPresenter,
   ClaimSortColumn,
   ClaimsService,
-  IdentityPresenter,
   PositionSortColumn,
   SortColumn,
   SortDirection,
@@ -112,7 +111,7 @@ export async function getUserSavedLists({
   }
 }
 
-export async function getListIdentities({
+export async function getListClaims({
   request,
   objectId,
   creator,
@@ -134,7 +133,7 @@ export async function getListIdentities({
   })
   const displayName = searchParams.get('search') || null
 
-  const listIdentities = await fetchWrapper(request, {
+  const listClaims = await fetchWrapper(request, {
     method: ClaimsService.searchClaims,
     args: {
       page,
@@ -150,53 +149,19 @@ export async function getListIdentities({
     },
   })
 
-  const totalPages = calculateTotalPages(listIdentities?.total ?? 0, limit)
-
-  const listIdentitiesSubjects = listIdentities.data.map(
-    (claim) => claim.subject,
-  ) as IdentityPresenter[]
+  const totalPages = calculateTotalPages(listClaims?.total ?? 0, limit)
 
   return {
-    listIdentities: listIdentitiesSubjects as IdentityPresenter[],
-    claims: listIdentities.data as ClaimPresenter[],
+    claims: listClaims.data as ClaimPresenter[],
     pagination: {
       currentPage: Number(page),
       limit: Number(limit),
-      totalEntries: listIdentities.total,
+      totalEntries: listClaims.total,
       totalPages,
     },
   }
 }
 
-export async function getListIdentitiesCount({
-  request,
-  objectId,
-  creator,
-  userWithPosition,
-  userAssetsForPresent = null,
-}: {
-  request: Request
-  objectId: string
-  creator?: string
-  userWithPosition?: string
-  userAssetsForPresent?: boolean | null
-}) {
-  const listIdentities = await fetchWrapper(request, {
-    method: ClaimsService.searchClaims,
-    args: {
-      predicate: getSpecialPredicate(CURRENT_ENV).tagPredicate.id,
-      object: objectId,
-      creator,
-      userWithPosition,
-      page: 1,
-      limit: 1,
-      userAssetsPresent: userAssetsForPresent,
-    },
-  })
-
-  return listIdentities.total
-}
-
 export async function getFeaturedLists({
   request,
   listIds,
diff --git a/apps/portal/app/lib/utils/misc.tsx b/apps/portal/app/lib/utils/misc.tsx
index 547609c6e..62eb2f167 100644
--- a/apps/portal/app/lib/utils/misc.tsx
+++ b/apps/portal/app/lib/utils/misc.tsx
@@ -398,8 +398,8 @@ export const getAtomLink = (
       : `${PATHS.PROFILE}/${atom.identity_id}`
   }
   return readOnly
-    ? `${PATHS.READONLY_IDENTITY}/${atom.id}`
-    : `${PATHS.IDENTITY}/${atom.id}`
+    ? `${PATHS.READONLY_IDENTITY}/${atom.vault_id}`
+    : `${PATHS.IDENTITY}/${atom.vault_id}`
 }
 
 export const getAtomId = (atom: IdentityPresenter) => {
@@ -440,3 +440,6 @@ export const getProfileUrl = (
   const baseUrl = readOnly ? `${PATHS.READONLY_PROFILE}/` : `${PATHS.PROFILE}/`
   return `${baseUrl}${userAddress}`
 }
+
+export const sleep = (ms: number) =>
+  new Promise((resolve) => setTimeout(resolve, ms))
diff --git a/apps/portal/app/routes/app+/claim+/$id.tsx b/apps/portal/app/routes/app+/claim+/$id.tsx
index 585c219a8..758e72fb1 100644
--- a/apps/portal/app/routes/app+/claim+/$id.tsx
+++ b/apps/portal/app/routes/app+/claim+/$id.tsx
@@ -1,5 +1,4 @@
 import {
-  Banner,
   Claim,
   ClaimStakeCard,
   Icon,
@@ -28,7 +27,7 @@ import ShareModal from '@components/share-modal'
 import StakeModal from '@components/stake/stake-modal'
 import { useGoBack } from '@lib/hooks/useGoBack'
 import { useLiveLoader } from '@lib/hooks/useLiveLoader'
-import { getClaimOrPending } from '@lib/services/claims'
+import { getClaim } from '@lib/services/claims'
 import { shareModalAtom, stakeModalAtom } from '@lib/state/store'
 import { getSpecialPredicate } from '@lib/utils/app'
 import {
@@ -71,7 +70,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
   const direction: SortDirection =
     (searchParams.get('direction') as SortDirection) ?? 'desc'
 
-  const { claim, isPending } = await getClaimOrPending(request, id)
+  const { claim } = await getClaim(request, id)
 
   if (!claim) {
     throw new Response('Not Found', { status: 404 })
@@ -96,7 +95,6 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
   return json({
     wallet,
     claim,
-    isPending,
     sortBy,
     direction,
     vaultDetails,
@@ -110,50 +108,37 @@ export interface ClaimDetailsLoaderData {
 }
 
 export default function ClaimDetails() {
-  const { wallet, claim, vaultDetails, isPending } = useLiveLoader<{
+  const { wallet, claim, vaultDetails } = useLiveLoader<{
     wallet: string
     claim: ClaimPresenter
     vaultDetails: VaultDetailsType
-    isPending: boolean
   }>(['create', 'attest'])
   const [stakeModalActive, setStakeModalActive] = useAtom(stakeModalAtom)
   const [shareModalActive, setShareModalActive] = useAtom(shareModalAtom)
 
-  const direction: 'for' | 'against' = isPending
-    ? 'for'
-    : (vaultDetails?.user_conviction ?? claim.user_conviction_for) > '0' ||
-        (vaultDetails?.user_conviction_against ??
-          claim.user_conviction_against) === '0'
+  const direction: 'for' | 'against' =
+    (vaultDetails?.user_conviction_against ?? claim.user_conviction_against) ===
+    '0'
       ? 'for'
       : 'against'
 
-  const user_assets: string = isPending
-    ? '0'
-    : (vaultDetails?.user_conviction ?? claim.user_conviction_for) > '0'
+  const user_assets: string =
+    (vaultDetails?.user_conviction ?? claim.user_conviction_for) > '0'
       ? vaultDetails?.user_assets ?? claim.user_assets_for
       : vaultDetails?.user_assets_against ?? claim.user_assets_against
 
-  const assets_sum: string = isPending
-    ? '0'
-    : (vaultDetails?.assets_sum ?? claim.for_assets_sum) > '0'
+  const assets_sum: string =
+    (vaultDetails?.assets_sum ?? claim.for_assets_sum) > '0'
       ? vaultDetails?.assets_sum ?? claim.for_assets_sum
       : vaultDetails?.against_assets_sum ?? claim.against_assets_sum
 
-  const userConviction = isPending
-    ? '0'
-    : vaultDetails?.user_conviction ?? claim.user_conviction_for
+  const userConviction =
+    vaultDetails?.user_conviction ?? claim.user_conviction_for
 
-  const directionTagVariant = isPending
-    ? TagVariant.for
-    : +userConviction > 0
-      ? TagVariant.for
-      : TagVariant.against
+  const directionTagVariant =
+    +userConviction > 0 ? TagVariant.for : TagVariant.against
 
-  const directionTagText = isPending
-    ? 'FOR'
-    : +userConviction > 0
-      ? 'FOR'
-      : 'AGAINST'
+  const directionTagText = +userConviction > 0 ? 'FOR' : 'AGAINST'
 
   const handleGoBack = useGoBack({ fallbackRoute: PATHS.EXPLORE_CLAIMS })
 
@@ -203,7 +188,7 @@ export default function ClaimDetails() {
           }}
         />
       </div>
-      {vaultDetails !== null && user_assets !== '0' && !isPending ? (
+      {vaultDetails !== null && user_assets !== '0' ? (
         <PositionCard
           onButtonClick={() =>
             setStakeModalActive((prevState) => ({
@@ -244,54 +229,50 @@ export default function ClaimDetails() {
           <PositionCardLastUpdated timestamp={claim.updated_at} />
         </PositionCard>
       ) : null}
-      {!isPending && (
-        <ClaimStakeCard
-          currency="ETH"
-          totalTVL={
-            +formatBalance(
-              +vaultDetails.assets_sum +
-                +(vaultDetails.against_assets_sum
-                  ? vaultDetails.against_assets_sum
-                  : '0'),
-            )
-          }
-          tvlAgainst={
-            +formatBalance(
-              vaultDetails.against_assets_sum ?? claim.against_assets_sum,
-            )
-          }
-          tvlFor={
-            +formatBalance(vaultDetails.assets_sum ?? claim.for_assets_sum)
-          }
-          amountAgainst={claim.against_num_positions}
-          amountFor={claim.for_num_positions}
-          onAgainstBtnClick={() =>
-            setStakeModalActive((prevState) => ({
-              ...prevState,
-              mode: 'deposit',
-              modalType: 'claim',
-              direction: 'against',
-              isOpen: true,
-            }))
-          }
-          onForBtnClick={() =>
-            setStakeModalActive((prevState) => ({
-              ...prevState,
-              mode: 'deposit',
-              modalType: 'claim',
-              direction: 'for',
-              isOpen: true,
-            }))
-          }
-          disableForBtn={
-            (vaultDetails.user_conviction_against ??
-              claim.user_conviction_against) > '0'
-          }
-          disableAgainstBtn={
-            (vaultDetails.user_conviction ?? claim.user_conviction_for) > '0'
-          }
-        />
-      )}
+      <ClaimStakeCard
+        currency="ETH"
+        totalTVL={
+          +formatBalance(
+            +vaultDetails.assets_sum +
+              +(vaultDetails.against_assets_sum
+                ? vaultDetails.against_assets_sum
+                : '0'),
+          )
+        }
+        tvlAgainst={
+          +formatBalance(
+            vaultDetails.against_assets_sum ?? claim.against_assets_sum,
+          )
+        }
+        tvlFor={+formatBalance(vaultDetails.assets_sum ?? claim.for_assets_sum)}
+        amountAgainst={claim.against_num_positions}
+        amountFor={claim.for_num_positions}
+        onAgainstBtnClick={() =>
+          setStakeModalActive((prevState) => ({
+            ...prevState,
+            mode: 'deposit',
+            modalType: 'claim',
+            direction: 'against',
+            isOpen: true,
+          }))
+        }
+        onForBtnClick={() =>
+          setStakeModalActive((prevState) => ({
+            ...prevState,
+            mode: 'deposit',
+            modalType: 'claim',
+            direction: 'for',
+            isOpen: true,
+          }))
+        }
+        disableForBtn={
+          (vaultDetails.user_conviction_against ??
+            claim.user_conviction_against) > '0'
+        }
+        disableAgainstBtn={
+          (vaultDetails.user_conviction ?? claim.user_conviction_for) > '0'
+        }
+      />
       <DetailInfoCard
         variant={Identity.user}
         list={
@@ -322,45 +303,26 @@ export default function ClaimDetails() {
     </div>
   )
 
-  const rightPanel = isPending ? (
-    <Banner
-      variant="warning"
-      title="Please Refresh the Page"
-      message="It looks like the on-chain transaction was successful, but we're still waiting for the information to update. Please refresh the page to ensure everything is up to date."
-    >
-      <NavigationButton
-        reloadDocument
-        variant="secondary"
-        to=""
-        className="max-lg:w-full"
-      >
-        Refresh
-      </NavigationButton>
-    </Banner>
-  ) : (
-    <Outlet />
-  )
+  const rightPanel = <Outlet />
 
   return (
     <>
       <TwoPanelLayout leftPanel={leftPanel} rightPanel={rightPanel} />
-      {!isPending && (
-        <StakeModal
-          userWallet={wallet}
-          contract={claim.contract}
-          open={stakeModalActive.isOpen}
-          direction={stakeModalActive.direction}
-          claim={claim}
-          vaultDetails={vaultDetails}
-          onClose={() => {
-            setStakeModalActive((prevState) => ({
-              ...prevState,
-              isOpen: false,
-              mode: undefined,
-            }))
-          }}
-        />
-      )}
+      <StakeModal
+        userWallet={wallet}
+        contract={claim.contract}
+        open={stakeModalActive.isOpen}
+        direction={stakeModalActive.direction}
+        claim={claim}
+        vaultDetails={vaultDetails}
+        onClose={() => {
+          setStakeModalActive((prevState) => ({
+            ...prevState,
+            isOpen: false,
+            mode: undefined,
+          }))
+        }}
+      />
       <ShareModal
         currentPath={location.pathname}
         open={shareModalActive.isOpen}
diff --git a/apps/portal/app/routes/app+/identity+/$id.tsx b/apps/portal/app/routes/app+/identity+/$id.tsx
index 4767298e8..a19466edf 100644
--- a/apps/portal/app/routes/app+/identity+/$id.tsx
+++ b/apps/portal/app/routes/app+/identity+/$id.tsx
@@ -254,7 +254,7 @@ export default function IdentityDetails() {
               }))
             }
             onViewAllClick={() =>
-              navigate(`${PATHS.IDENTITY}/${identity.id}#positions`)
+              navigate(`${PATHS.IDENTITY}/${identity.vault_id}#positions`)
             }
           />
         </>
diff --git a/apps/portal/app/routes/app+/list+/$id+/index.tsx b/apps/portal/app/routes/app+/list+/$id+/index.tsx
index e04fb9d99..bc1418329 100644
--- a/apps/portal/app/routes/app+/list+/$id+/index.tsx
+++ b/apps/portal/app/routes/app+/list+/$id+/index.tsx
@@ -27,7 +27,7 @@ import { ListTabIdentityDisplay } from '@components/lists/list-tab-identity-disp
 import SaveListModal from '@components/save-list/save-list-modal'
 import { DataHeaderSkeleton, PaginatedListSkeleton } from '@components/skeleton'
 import { useLiveLoader } from '@lib/hooks/useLiveLoader'
-import { getListIdentities, getListIdentitiesCount } from '@lib/services/lists'
+import { getListClaims } from '@lib/services/lists'
 import { addIdentitiesListModalAtom, saveListModalAtom } from '@lib/state/store'
 import {
   getAtomDescription,
@@ -52,7 +52,7 @@ import {
   NO_PARAM_ID_ERROR,
   NO_WALLET_ERROR,
 } from 'app/consts'
-import { IdentityListType, VaultDetailsType } from 'app/types'
+import { VaultDetailsType } from 'app/types'
 import { useAtom, useSetAtom } from 'jotai'
 
 export async function loader({ request, params }: LoaderFunctionArgs) {
@@ -88,43 +88,23 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
   })
   invariant(claim.object?.id, NO_PARAM_ID_ERROR)
 
-  const totalGlobalIdentitiesCount = getListIdentitiesCount({
-    request,
-    objectId: claim.object.id,
-  })
-
-  const totalUserIdentitiesCount = getListIdentitiesCount({
-    request,
-    objectId: claim.object.id,
-    userWithPosition: userObject.id,
-    userAssetsForPresent: true,
-  })
-
-  const totalAdditionalUserIdentitiesCount = paramWallet
-    ? getListIdentitiesCount({
-        request,
-        objectId: claim.object.id,
-        userWithPosition: additionalUserObject?.id,
-        userAssetsForPresent: true,
-      })
-    : 0
   return defer({
     wallet,
     userObject,
-    globalListIdentities: getListIdentities({
+    globalListClaims: getListClaims({
       request,
       objectId: claim.object.id,
       searchParams,
     }),
-    userListIdentities: getListIdentities({
+    userListClaims: getListClaims({
       request,
       objectId: claim.object.id,
       searchParams,
       userWithPosition: userObject.id,
       userAssetsForPresent: true,
     }),
-    additionalUserListIdentities: paramWallet
-      ? getListIdentities({
+    additionalUserListClaims: paramWallet
+      ? getListClaims({
           request,
           objectId: claim.object.id,
           searchParams,
@@ -132,9 +112,6 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
           userAssetsForPresent: true,
         })
       : null,
-    totalGlobalIdentitiesCount,
-    totalUserIdentitiesCount,
-    additionalTotalUserIdentitiesCount: totalAdditionalUserIdentitiesCount,
     additionalUserObject,
   })
 }
@@ -142,10 +119,9 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
 export default function ListOverview() {
   const {
     wallet,
-    globalListIdentities,
-    userListIdentities,
-    additionalUserListIdentities,
-    totalGlobalIdentitiesCount,
+    globalListClaims,
+    userListClaims,
+    additionalUserListClaims,
     userObject,
     additionalUserObject,
   } = useLiveLoader<typeof loader>(['create', 'attest'])
@@ -215,11 +191,11 @@ export default function ListOverview() {
       </div>
       <div className="flex flex-col gap-6 w-full">
         <Suspense fallback={<DataHeaderSkeleton />}>
-          <Await resolve={totalGlobalIdentitiesCount} errorElement={<></>}>
-            {(resolvedtotalIdentitiesCount) => (
+          <Await resolve={globalListClaims} errorElement={<></>}>
+            {(resolvedGlobalListClaims) => (
               <ListHeaderCard
                 label="Identities"
-                value={resolvedtotalIdentitiesCount}
+                value={resolvedGlobalListClaims.pagination.totalEntries}
               >
                 <Claim
                   size="md"
@@ -267,13 +243,13 @@ export default function ListOverview() {
             <Suspense
               fallback={<Skeleton className="w-44 h-10 rounded mr-2" />}
             >
-              <Await resolve={globalListIdentities}>
-                {(resolvedGlobalListIdentities) => (
+              <Await resolve={globalListClaims}>
+                {(resolvedGlobalListClaims) => (
                   <TabsTrigger
                     value="global"
                     label="Global"
                     totalCount={
-                      resolvedGlobalListIdentities?.pagination.totalEntries
+                      resolvedGlobalListClaims?.pagination.totalEntries
                     }
                     onClick={(e) => {
                       e.preventDefault()
@@ -284,8 +260,8 @@ export default function ListOverview() {
               </Await>
             </Suspense>
             <Suspense fallback={<Skeleton className="w-44 h-10 rounded" />}>
-              <Await resolve={userListIdentities}>
-                {(resolvedUserListIdentities) => (
+              <Await resolve={userListClaims}>
+                {(resolvedUserListClaims) => (
                   <TabsTrigger
                     value="you"
                     label={
@@ -293,9 +269,7 @@ export default function ListOverview() {
                         You
                       </ListTabIdentityDisplay>
                     }
-                    totalCount={
-                      resolvedUserListIdentities?.pagination.totalEntries
-                    }
+                    totalCount={resolvedUserListClaims?.pagination.totalEntries}
                     onClick={(e) => {
                       e.preventDefault()
                       handleTabChange('you')
@@ -306,13 +280,13 @@ export default function ListOverview() {
             </Suspense>
             {userWalletAddress && (
               <Suspense fallback={<Skeleton className="w-44 h-10 rounded" />}>
-                <Await resolve={additionalUserListIdentities}>
-                  {(resolvedAdditionalUserListIdentities) => (
+                <Await resolve={additionalUserListClaims}>
+                  {(resolvedAdditionalUserListClaims) => (
                     <TabsTrigger
                       className="text-left"
                       value="additional"
                       totalCount={
-                        resolvedAdditionalUserListIdentities?.pagination
+                        resolvedAdditionalUserListClaims?.pagination
                           .totalEntries
                       }
                       label={
@@ -334,18 +308,17 @@ export default function ListOverview() {
           </TabsList>
           <TabsContent value="global" className="mt-6">
             <Suspense fallback={<PaginatedListSkeleton />}>
-              <Await resolve={globalListIdentities}>
-                {(resolvedGlobalListIdentities: IdentityListType | null) => {
-                  if (!resolvedGlobalListIdentities) {
+              <Await resolve={globalListClaims}>
+                {(resolvedGlobalListClaims) => {
+                  if (!resolvedGlobalListClaims) {
                     return <PaginatedListSkeleton />
                   }
                   return isNavigating ? (
                     <PaginatedListSkeleton />
                   ) : (
                     <TagsList
-                      identities={resolvedGlobalListIdentities.listIdentities}
-                      claims={resolvedGlobalListIdentities.claims}
-                      pagination={resolvedGlobalListIdentities.pagination}
+                      claims={resolvedGlobalListClaims.claims}
+                      pagination={resolvedGlobalListClaims.pagination}
                       claim={claim}
                       wallet={wallet}
                       enableSearch={true}
@@ -358,18 +331,17 @@ export default function ListOverview() {
           </TabsContent>
           <TabsContent value="you">
             <Suspense fallback={<PaginatedListSkeleton />}>
-              <Await resolve={userListIdentities}>
-                {(resolvedUserListIdentities: IdentityListType | null) => {
-                  if (!resolvedUserListIdentities) {
+              <Await resolve={userListClaims}>
+                {(resolvedUserListClaims) => {
+                  if (!resolvedUserListClaims) {
                     return <PaginatedListSkeleton />
                   }
                   return isNavigating ? (
                     <PaginatedListSkeleton />
                   ) : (
                     <TagsList
-                      identities={resolvedUserListIdentities.listIdentities}
-                      claims={resolvedUserListIdentities.claims}
-                      pagination={resolvedUserListIdentities.pagination}
+                      claims={resolvedUserListClaims.claims}
+                      pagination={resolvedUserListClaims.pagination}
                       claim={claim}
                       tag={claim.object}
                       wallet={wallet}
@@ -381,24 +353,17 @@ export default function ListOverview() {
               </Await>
             </Suspense>
           </TabsContent>
-          {userWalletAddress && !!additionalUserListIdentities && (
+          {userWalletAddress && !!additionalUserListClaims && (
             <TabsContent value="additional">
               <Suspense fallback={<PaginatedListSkeleton />}>
-                <Await resolve={additionalUserListIdentities}>
-                  {(
-                    resolvedAdditionalUserListIdentities: IdentityListType | null,
-                  ) => {
+                <Await resolve={additionalUserListClaims}>
+                  {(resolvedAdditionalUserListClaims) => {
                     return isNavigating ? (
                       <PaginatedListSkeleton />
-                    ) : resolvedAdditionalUserListIdentities ? (
+                    ) : resolvedAdditionalUserListClaims ? (
                       <TagsList
-                        identities={
-                          resolvedAdditionalUserListIdentities.listIdentities
-                        }
-                        claims={resolvedAdditionalUserListIdentities.claims}
-                        pagination={
-                          resolvedAdditionalUserListIdentities.pagination
-                        }
+                        claims={resolvedAdditionalUserListClaims.claims}
+                        pagination={resolvedAdditionalUserListClaims.pagination}
                         claim={claim}
                         tag={claim.object}
                         wallet={wallet}
diff --git a/apps/portal/app/routes/app+/list+/$id.tsx b/apps/portal/app/routes/app+/list+/$id.tsx
index b76de3907..ffdd7cab0 100644
--- a/apps/portal/app/routes/app+/list+/$id.tsx
+++ b/apps/portal/app/routes/app+/list+/$id.tsx
@@ -123,7 +123,7 @@ export default function ListDetails() {
         displayName={claim.object?.display_name ?? ''}
         avatarImgSrc={claim.object?.image ?? ''}
         onClick={() => {
-          navigate(`/app/identity/${claim.object?.id}`)
+          navigate(`/app/identity/${claim.object?.vault_id}`)
         }}
         className="hover:cursor-pointer w-full"
       />
@@ -143,7 +143,7 @@ export default function ListDetails() {
       <Button
         variant="secondary"
         onClick={() => {
-          navigate(`/app/identity/${claim.object?.id}`)
+          navigate(`/app/identity/${claim.object?.vault_id}`)
         }}
         className="w-full"
       >
diff --git a/apps/portal/app/routes/app+/quest+/chapter+/1-6-always_true.tsx b/apps/portal/app/routes/app+/quest+/chapter+/1-6-always_true.tsx
index cba49d636..4e4648fa0 100644
--- a/apps/portal/app/routes/app+/quest+/chapter+/1-6-always_true.tsx
+++ b/apps/portal/app/routes/app+/quest+/chapter+/1-6-always_true.tsx
@@ -29,7 +29,7 @@ import SaveListModal from '@components/save-list/save-list-modal'
 import { PaginatedListSkeleton } from '@components/skeleton'
 import { useQuestCompletion } from '@lib/hooks/useQuestCompletion'
 import { useQuestMdxContent } from '@lib/hooks/useQuestMdxContent'
-import { getListIdentities } from '@lib/services/lists'
+import { getListClaims } from '@lib/services/lists'
 import { saveListModalAtom } from '@lib/state/store'
 import { getQuestObjects } from '@lib/utils/app'
 import logger from '@lib/utils/logger'
@@ -46,7 +46,7 @@ import {
   MIN_DEPOSIT,
   MULTIVAULT_CONTRACT_ADDRESS,
 } from 'app/consts'
-import { IdentityListType, MDXContentVariant } from 'app/types'
+import { MDXContentVariant } from 'app/types'
 import { useAtom } from 'jotai'
 import { parseUnits } from 'viem'
 
@@ -96,7 +96,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
     args: { id: discoverListFallbackAtomId },
   })
 
-  const globalListIdentities = await getListIdentities({
+  const globalListClaims = await getListClaims({
     request,
     objectId: claim.object?.id ?? '',
     searchParams,
@@ -111,7 +111,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
     userQuest,
     userWallet: user.wallet?.address,
     claim,
-    globalListIdentities,
+    globalListClaims,
   })
 }
 
@@ -141,7 +141,7 @@ export async function action({ request }: ActionFunctionArgs) {
 }
 
 export default function Quests() {
-  const { quest, userQuest, userWallet, claim, globalListIdentities } =
+  const { quest, userQuest, userWallet, claim, globalListClaims } =
     useLoaderData<typeof loader>()
   const actionData = useActionData<typeof action>()
   const { successModalOpen, setSuccessModalOpen } =
@@ -180,9 +180,9 @@ export default function Quests() {
 
         <div className="rounded-lg theme-border p-5 flex min-h-96 theme-border text-warning/30 overflow-auto">
           <Suspense fallback={<PaginatedListSkeleton />}>
-            <Await resolve={globalListIdentities}>
-              {(resolvedGlobalListIdentities: IdentityListType | null) => {
-                if (!resolvedGlobalListIdentities) {
+            <Await resolve={globalListClaims}>
+              {(resolveGlobalListClaims) => {
+                if (!resolveGlobalListClaims) {
                   return <PaginatedListSkeleton />
                 }
                 return (
@@ -196,9 +196,8 @@ export default function Quests() {
                         maxStringLength={72}
                       />
                       <TagsList
-                        identities={resolvedGlobalListIdentities.listIdentities}
-                        claims={resolvedGlobalListIdentities.claims}
-                        pagination={resolvedGlobalListIdentities.pagination}
+                        claims={resolveGlobalListClaims.claims}
+                        pagination={resolveGlobalListClaims.pagination}
                         claim={claim}
                         tag={claim.object}
                         wallet={userWallet}
diff --git a/apps/portal/app/routes/readonly+/claim+/$id.tsx b/apps/portal/app/routes/readonly+/claim+/$id.tsx
index 2ae9e837f..d08cee07a 100644
--- a/apps/portal/app/routes/readonly+/claim+/$id.tsx
+++ b/apps/portal/app/routes/readonly+/claim+/$id.tsx
@@ -1,4 +1,4 @@
-import { Banner, BannerVariant, Claim, Identity } from '@0xintuition/1ui'
+import { BannerVariant, Claim, Identity } from '@0xintuition/1ui'
 import {
   ClaimPresenter,
   ClaimSortColumn,
@@ -8,10 +8,9 @@ import {
 
 import { DetailInfoCard } from '@components/detail-info-card'
 import { ErrorPage } from '@components/error-page'
-import NavigationButton from '@components/navigation-link'
 import ReadOnlyBanner from '@components/read-only-banner'
 import { useLiveLoader } from '@lib/hooks/useLiveLoader'
-import { getClaimOrPending } from '@lib/services/claims'
+import { getClaim } from '@lib/services/claims'
 import { getSpecialPredicate } from '@lib/utils/app'
 import logger from '@lib/utils/logger'
 import {
@@ -41,7 +40,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
   const direction: SortDirection =
     (searchParams.get('direction') as SortDirection) ?? 'desc'
 
-  const { claim, isPending } = await getClaimOrPending(request, id)
+  const { claim } = await getClaim(request, id)
 
   if (!claim) {
     throw new Response('Not Found', { status: 404 })
@@ -70,7 +69,6 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
 
   return json({
     claim,
-    isPending,
     sortBy,
     direction,
     vaultDetails,
@@ -132,9 +130,8 @@ export interface ReadOnlyClaimDetailsLoaderData {
 }
 
 export default function ReadOnlyClaimDetails() {
-  const { claim, isPending } = useLiveLoader<{
+  const { claim } = useLiveLoader<{
     claim: ClaimPresenter
-    isPending: boolean
   }>(['create', 'attest'])
 
   const leftPanel = (
@@ -198,29 +195,12 @@ export default function ReadOnlyClaimDetails() {
       />
       <ReadOnlyBanner
         variant={BannerVariant.warning}
-        to={`${PATHS.CLAIM}/${claim.claim_id}`}
+        to={`${PATHS.CLAIM}/${claim.vault_id}`}
       />
     </div>
   )
 
-  const rightPanel = isPending ? (
-    <Banner
-      variant="warning"
-      title="Please Refresh the Page"
-      message="It looks like the on-chain transaction was successful, but we're still waiting for the information to update. Please refresh the page to ensure everything is up to date."
-    >
-      <NavigationButton
-        reloadDocument
-        variant="secondary"
-        to=""
-        className="max-lg:w-full"
-      >
-        Refresh
-      </NavigationButton>
-    </Banner>
-  ) : (
-    <Outlet />
-  )
+  const rightPanel = <Outlet />
 
   return (
     <>
diff --git a/apps/portal/app/routes/readonly+/identity+/$id.tsx b/apps/portal/app/routes/readonly+/identity+/$id.tsx
index 379ced2f9..2f2b0c949 100644
--- a/apps/portal/app/routes/readonly+/identity+/$id.tsx
+++ b/apps/portal/app/routes/readonly+/identity+/$id.tsx
@@ -209,7 +209,7 @@ export default function ReadOnlyIdentityDetails() {
       />
       <ReadOnlyBanner
         variant={BannerVariant.warning}
-        to={`${PATHS.IDENTITY}/${identity.id}`}
+        to={`${PATHS.IDENTITY}/${identity.vault_id}`}
       />
     </div>
   )
diff --git a/apps/portal/app/routes/readonly+/list+/$id+/index.tsx b/apps/portal/app/routes/readonly+/list+/$id+/index.tsx
index 031cb47dc..95e8743fc 100644
--- a/apps/portal/app/routes/readonly+/list+/$id+/index.tsx
+++ b/apps/portal/app/routes/readonly+/list+/$id+/index.tsx
@@ -21,7 +21,7 @@ import { TagsList } from '@components/list/tags'
 import { ListTabIdentityDisplay } from '@components/lists/list-tab-identity-display'
 import { DataHeaderSkeleton, PaginatedListSkeleton } from '@components/skeleton'
 import { useLiveLoader } from '@lib/hooks/useLiveLoader'
-import { getListIdentities, getListIdentitiesCount } from '@lib/services/lists'
+import { getListClaims } from '@lib/services/lists'
 import {
   getAtomDescription,
   getAtomImage,
@@ -39,7 +39,7 @@ import {
 } from '@remix-run/react'
 import { fetchWrapper } from '@server/api'
 import { NO_CLAIM_ERROR, NO_PARAM_ID_ERROR } from 'app/consts'
-import { IdentityListType, VaultDetailsType } from 'app/types'
+import { VaultDetailsType } from 'app/types'
 
 export async function loader({ request, params }: LoaderFunctionArgs) {
   const id = params.id
@@ -64,33 +64,19 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
   })
   invariant(claim.object?.id, NO_PARAM_ID_ERROR)
 
-  const totalGlobalIdentitiesCount = getListIdentitiesCount({
-    request,
-    objectId: claim.object.id,
-  })
-
-  const totalAdditionalUserIdentitiesCount = paramWallet
-    ? getListIdentitiesCount({
-        request,
-        objectId: claim.object.id,
-        userWithPosition: additionalUserObject?.id,
-        userAssetsForPresent: true,
-      })
-    : 0
-
   return defer({
-    globalListIdentities: getListIdentities({
+    globalListClaims: getListClaims({
       request,
       objectId: claim.object.id,
       searchParams,
     }),
-    userListIdentities: getListIdentities({
+    userListClaims: getListClaims({
       request,
       objectId: claim.object.id,
       searchParams,
     }),
-    additionalUserListIdentities: paramWallet
-      ? getListIdentities({
+    additionalUserListClaims: paramWallet
+      ? getListClaims({
           request,
           objectId: claim.object.id,
           searchParams,
@@ -98,19 +84,15 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
           userAssetsForPresent: true,
         })
       : null,
-    totalGlobalIdentitiesCount,
-    totalAdditionalUserIdentitiesCount,
     additionalUserObject,
   })
 }
 
 export default function ReadOnlyListOverview() {
   const {
-    globalListIdentities,
-    userListIdentities,
-    additionalUserListIdentities,
-    totalGlobalIdentitiesCount,
-
+    globalListClaims,
+    userListClaims,
+    additionalUserListClaims,
     additionalUserObject,
   } = useLiveLoader<typeof loader>(['create', 'attest'])
 
@@ -147,11 +129,11 @@ export default function ReadOnlyListOverview() {
     <div className="flex-col justify-start items-start flex w-full gap-6">
       <div className="flex flex-col gap-6 w-full">
         <Suspense fallback={<DataHeaderSkeleton />}>
-          <Await resolve={totalGlobalIdentitiesCount} errorElement={<></>}>
-            {(resolvedtotalIdentitiesCount) => (
+          <Await resolve={globalListClaims} errorElement={<></>}>
+            {(resolvedGlobalListClaims) => (
               <ListHeaderCard
                 label="Identities"
-                value={resolvedtotalIdentitiesCount}
+                value={resolvedGlobalListClaims.pagination.totalEntries}
               >
                 <Claim
                   size="md"
@@ -202,13 +184,13 @@ export default function ReadOnlyListOverview() {
             <Suspense
               fallback={<Skeleton className="w-44 h-10 rounded mr-2" />}
             >
-              <Await resolve={globalListIdentities}>
-                {(resolvedGlobalListIdentities) => (
+              <Await resolve={globalListClaims}>
+                {(resolvedGlobalListClaims) => (
                   <TabsTrigger
                     value="global"
                     label="Global"
                     totalCount={
-                      resolvedGlobalListIdentities?.pagination.totalEntries
+                      resolvedGlobalListClaims?.pagination.totalEntries
                     }
                     onClick={(e) => {
                       e.preventDefault()
@@ -220,13 +202,13 @@ export default function ReadOnlyListOverview() {
             </Suspense>
             {userWalletAddress && (
               <Suspense fallback={<Skeleton className="w-44 h-10 rounded" />}>
-                <Await resolve={additionalUserListIdentities}>
-                  {(resolvedAdditionalUserListIdentities) => (
+                <Await resolve={additionalUserListClaims}>
+                  {(resolvedAdditionalUserListClaims) => (
                     <TabsTrigger
                       className="text-left"
                       value="additional"
                       totalCount={
-                        resolvedAdditionalUserListIdentities?.pagination
+                        resolvedAdditionalUserListClaims?.pagination
                           .totalEntries
                       }
                       label={
@@ -248,18 +230,17 @@ export default function ReadOnlyListOverview() {
           </TabsList>
           <TabsContent value="global" className="mt-6">
             <Suspense fallback={<PaginatedListSkeleton />}>
-              <Await resolve={globalListIdentities}>
-                {(resolvedGlobalListIdentities: IdentityListType | null) => {
-                  if (!resolvedGlobalListIdentities) {
+              <Await resolve={globalListClaims}>
+                {(resolvedGlobalListClaims) => {
+                  if (!resolvedGlobalListClaims) {
                     return <PaginatedListSkeleton />
                   }
                   return isNavigating ? (
                     <PaginatedListSkeleton />
                   ) : (
                     <TagsList
-                      identities={resolvedGlobalListIdentities.listIdentities}
-                      claims={resolvedGlobalListIdentities.claims}
-                      pagination={resolvedGlobalListIdentities.pagination}
+                      claims={resolvedGlobalListClaims.claims}
+                      pagination={resolvedGlobalListClaims.pagination}
                       claim={claim}
                       enableSearch={true}
                       enableSort={true}
@@ -272,18 +253,17 @@ export default function ReadOnlyListOverview() {
           </TabsContent>
           <TabsContent value="you">
             <Suspense fallback={<PaginatedListSkeleton />}>
-              <Await resolve={userListIdentities}>
-                {(resolvedUserListIdentities: IdentityListType | null) => {
-                  if (!resolvedUserListIdentities) {
+              <Await resolve={userListClaims}>
+                {(resolvedUserListClaims) => {
+                  if (!resolvedUserListClaims) {
                     return <PaginatedListSkeleton />
                   }
                   return isNavigating ? (
                     <PaginatedListSkeleton />
                   ) : (
                     <TagsList
-                      identities={resolvedUserListIdentities.listIdentities}
-                      claims={resolvedUserListIdentities.claims}
-                      pagination={resolvedUserListIdentities.pagination}
+                      claims={resolvedUserListClaims.claims}
+                      pagination={resolvedUserListClaims.pagination}
                       claim={claim}
                       tag={claim.object}
                       enableSearch={true}
@@ -295,24 +275,17 @@ export default function ReadOnlyListOverview() {
               </Await>
             </Suspense>
           </TabsContent>
-          {userWalletAddress && !!additionalUserListIdentities && (
+          {userWalletAddress && !!additionalUserListClaims && (
             <TabsContent value="additional">
               <Suspense fallback={<PaginatedListSkeleton />}>
-                <Await resolve={additionalUserListIdentities}>
-                  {(
-                    resolvedAdditionalUserListIdentities: IdentityListType | null,
-                  ) => {
+                <Await resolve={additionalUserListClaims}>
+                  {(resolvedAdditionalUserListClaims) => {
                     return isNavigating ? (
                       <PaginatedListSkeleton />
-                    ) : resolvedAdditionalUserListIdentities ? (
+                    ) : resolvedAdditionalUserListClaims ? (
                       <TagsList
-                        identities={
-                          resolvedAdditionalUserListIdentities.listIdentities
-                        }
-                        claims={resolvedAdditionalUserListIdentities.claims}
-                        pagination={
-                          resolvedAdditionalUserListIdentities.pagination
-                        }
+                        claims={resolvedAdditionalUserListClaims.claims}
+                        pagination={resolvedAdditionalUserListClaims.pagination}
                         claim={claim}
                         tag={claim.object}
                         enableSearch={true}
diff --git a/apps/portal/app/routes/readonly+/list+/$id.tsx b/apps/portal/app/routes/readonly+/list+/$id.tsx
index ca95f1ae1..194cdb06a 100644
--- a/apps/portal/app/routes/readonly+/list+/$id.tsx
+++ b/apps/portal/app/routes/readonly+/list+/$id.tsx
@@ -129,7 +129,7 @@ export default function ReadOnlyListDetails() {
         displayName={claim.object?.display_name ?? ''}
         avatarImgSrc={claim.object?.image ?? ''}
         onClick={() => {
-          navigate(`/readonly/identity/${claim.object?.id}`)
+          navigate(`/readonly/identity/${claim.object?.vault_id}`)
         }}
         className="hover:cursor-pointer w-full"
       />
@@ -151,7 +151,7 @@ export default function ReadOnlyListDetails() {
       <Button
         variant="secondary"
         onClick={() => {
-          navigate(`/readonly/identity/${claim.object?.id}`)
+          navigate(`/readonly/identity/${claim.object?.vault_id}`)
         }}
         className="w-full"
       >
@@ -159,7 +159,7 @@ export default function ReadOnlyListDetails() {
       </Button>
       <ReadOnlyBanner
         variant={BannerVariant.warning}
-        to={`${PATHS.LIST}/${claim.claim_id}`}
+        to={`${PATHS.LIST}/${claim.vault_id}`}
       />
     </div>
   )
diff --git a/apps/portal/app/routes/resources+/create-og.ts b/apps/portal/app/routes/resources+/create-og.ts
index 2dd626c50..6d232becc 100644
--- a/apps/portal/app/routes/resources+/create-og.ts
+++ b/apps/portal/app/routes/resources+/create-og.ts
@@ -1,6 +1,6 @@
 import { ClaimsService } from '@0xintuition/api'
 
-import { getClaimOrPending } from '@lib/services/claims'
+import { getClaim } from '@lib/services/claims'
 import { getIdentityOrPending } from '@lib/services/identities'
 import { formatBalance } from '@lib/utils/misc'
 import type { LoaderFunctionArgs } from '@remix-run/node'
@@ -37,7 +37,7 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
     tvl = +formatBalance(BigInt(claim.object?.assets_sum ?? 0), 18)
 
     if (type === 'claim') {
-      const { claim, isPending } = await getClaimOrPending(request, id)
+      const { claim } = await getClaim(request, id)
 
       if (!claim) {
         throw new Response('Not Found', { status: 404 })
@@ -45,14 +45,10 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
 
       const stringifiedClaim = `${claim.subject?.display_name} - ${claim.predicate?.display_name} - ${claim.object?.display_name}`
       title = stringifiedClaim ?? 'Intuition Explorer'
-      holdersFor = isPending ? 'Pending' : claim.for_num_positions
-      holdersAgainst = isPending ? 'Pending' : claim.against_num_positions
-      tvlFor = isPending
-        ? 'Pending'
-        : +formatBalance(BigInt(claim.for_assets_sum ?? 0), 18)
-      tvlAgainst = isPending
-        ? 'Pending'
-        : +formatBalance(BigInt(claim.against_assets_sum ?? 0), 18)
+      holdersFor = claim.for_num_positions
+      holdersAgainst = claim.against_num_positions
+      tvlFor = +formatBalance(BigInt(claim.for_assets_sum ?? 0), 18)
+      tvlAgainst = +formatBalance(BigInt(claim.against_assets_sum ?? 0), 18)
     }
   } else if (type === 'identity') {
     const { identity, isPending } = await getIdentityOrPending(request, id)
diff --git a/apps/portal/app/routes/resources+/get-claim.tsx b/apps/portal/app/routes/resources+/get-claim.tsx
new file mode 100644
index 000000000..0f4272be6
--- /dev/null
+++ b/apps/portal/app/routes/resources+/get-claim.tsx
@@ -0,0 +1,51 @@
+import { ApiError, ClaimPresenter, ClaimsService } from '@0xintuition/api'
+
+import logger from '@lib/utils/logger'
+import { invariant, sleep } from '@lib/utils/misc'
+import { json, LoaderFunctionArgs } from '@remix-run/node'
+import { fetchWrapper } from '@server/api'
+import { requireUserWallet } from '@server/auth'
+import { NO_WALLET_ERROR } from 'app/consts'
+
+export interface GetClaimLoaderData {
+  claim: ClaimPresenter
+  error?: string
+}
+
+const MAX_RETRIES = 1
+const RETRY_DELAY = 2000 // 2 seconds
+
+export async function loader({ request }: LoaderFunctionArgs) {
+  const wallet = await requireUserWallet(request)
+  invariant(wallet, NO_WALLET_ERROR)
+
+  const url = new URL(request.url)
+  const vaultId = url.searchParams.get('vaultId') || ''
+
+  for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {
+    try {
+      const claim = await fetchWrapper(request, {
+        method: ClaimsService.getClaimById,
+        args: { id: vaultId },
+      })
+      if (claim) {
+        logger('[get-claim route] claim:', claim)
+        return json({ claim })
+      }
+      if (attempt < MAX_RETRIES - 1) {
+        await sleep(RETRY_DELAY)
+      }
+    } catch (error) {
+      if (error instanceof ApiError && error.status === 404) {
+        return json({ error: 'Claim not found' }, { status: 404 })
+      }
+      if (attempt === MAX_RETRIES - 1) {
+        logger('[get-claim route] Error:', error)
+        return json({ error: 'Error fetching claim' }, { status: 500 })
+      }
+      await sleep(RETRY_DELAY)
+    }
+  }
+
+  return json({ error: 'Claim not found' }, { status: 404 })
+}