From 147d964598b76fe406aeaf866cd3d72dccb162c3 Mon Sep 17 00:00:00 2001
From: Mudassir Shabbir <mudassir@agoric.com>
Date: Mon, 6 Oct 2025 13:22:13 +0500
Subject: [PATCH] chore: ymax1 support

---
 ui/src/App.tsx                            | 158 +++++++++++++++-------
 ui/src/components/Admin.tsx               |  14 +-
 ui/src/components/ContractControlCard.tsx |  14 +-
 ui/src/components/Trade.tsx               |  64 ++++++---
 ui/src/constants.ts                       |   5 +-
 ui/src/utils/stepUtils.ts                 |  14 +-
 ui/src/utils/walletUtils.ts               |  19 ++-
 ui/src/ymax-client.ts                     |   2 +
 8 files changed, 199 insertions(+), 91 deletions(-)

diff --git a/ui/src/App.tsx b/ui/src/App.tsx
index 4f58bb5..73a3a7c 100644
--- a/ui/src/App.tsx
+++ b/ui/src/App.tsx
@@ -28,6 +28,7 @@ import type {
 import type { Brand } from '@agoric/ertp/src/types.js';
 import { getBrand } from './utils';
 import { getInitialEnvironment, configureEndpoints } from './config';
+import { ContractVersion } from './constants';
 
 const { fromEntries } = Object;
 
@@ -36,14 +37,16 @@ let watcher = makeAgoricChainStorageWatcher(ENDPOINTS.API, ENDPOINTS.CHAIN_ID);
 
 const useAppStore = create<AppState>(() => ({}) as AppState);
 
-const setup = async () => {
+const setup = async (contractVersion: ContractVersion) => {
   watcher.watchLatest<Array<[string, unknown]>>(
     [Kind.Data, 'published.agoricNames.instance'],
     instances => {
       console.log('got instances', instances);
       useAppStore.setState({
         instances,
-        offerUpInstance: instances.find(([name]) => name === 'ymax0')!.at(1),
+        offerUpInstance: instances
+          .find(([name]) => name === contractVersion)!
+          .at(1),
       });
     },
   );
@@ -153,11 +156,20 @@ const makeOffer = (
             brand: usdcBrand as Brand<'nat'>,
             value: customStep.movement.amount.value,
           },
-          fee: customStep.movement.fee || (getBrand(useAppStore.getState().purses, 'BLD') ? { 
-            brand: getBrand(useAppStore.getState().purses, 'BLD') as Brand<'nat'>, 
-            value: 40n 
-          } : undefined),
-          detail: customStep.movement.detail || { evmGas: 200_000_000_000_000n },
+          fee:
+            customStep.movement.fee ||
+            (getBrand(useAppStore.getState().purses, 'BLD')
+              ? {
+                  brand: getBrand(
+                    useAppStore.getState().purses,
+                    'BLD',
+                  ) as Brand<'nat'>,
+                  value: 40n,
+                }
+              : undefined),
+          detail: customStep.movement.detail || {
+            evmGas: 200_000_000_000_000n,
+          },
         };
         customMovements.push(movement);
       }
@@ -195,12 +207,18 @@ const makeOffer = (
   // Combine base steps with custom steps
   const steps = [...baseSteps, ...customMovements];
 
+  // Build proposal: Access + Deposit (NOT GmpFee - contract handles fees internally)
+  const proposalGive = {
+    Access: { brand: poc26Brand, value: 1n },
+    Deposit: give.Deposit,
+  };
+
   console.log('Making offer with:', {
     instance: offerUpInstance,
-    give: {
-      ...give,
-      Access: { brand: poc26Brand, value: 1n },
-    },
+    proposal: { give: proposalGive },
+    offerArgs: { flow: steps },
+    stepsCount: steps.length,
+    note: 'GmpFee not in proposal - contract handles fees internally via flow',
   });
 
   // Generate a unique offerId
@@ -215,10 +233,7 @@ const makeOffer = (
       publicInvitationMaker: 'makeOpenPortfolioInvitation',
     },
     {
-      give: {
-        ...give,
-        Access: { brand: poc26Brand, value: 1n },
-      },
+      give: proposalGive,
     },
     { flow: steps },
     (update: { status: string; data?: unknown }) => {
@@ -278,35 +293,50 @@ const withdrawUSDC = () => {
   const { yProtocol = 'USDN' } = useAppStore.getState();
 
   const steps: MovementDesc[] = [
-    { 
-      src: yProtocol, 
-      dest: '@noble', 
+    {
+      src: yProtocol,
+      dest: '@noble',
       amount,
-      fee: getBrand(useAppStore.getState().purses, 'BLD') ? { 
-        brand: getBrand(useAppStore.getState().purses, 'BLD') as Brand<'nat'>, 
-        value: 0n 
-      } : undefined,
-      detail: {}
+      fee: getBrand(useAppStore.getState().purses, 'BLD')
+        ? {
+            brand: getBrand(
+              useAppStore.getState().purses,
+              'BLD',
+            ) as Brand<'nat'>,
+            value: 0n,
+          }
+        : undefined,
+      detail: {},
     },
-    { 
-      src: '@noble', 
-      dest: '@agoric', 
+    {
+      src: '@noble',
+      dest: '@agoric',
       amount,
-      fee: getBrand(useAppStore.getState().purses, 'BLD') ? { 
-        brand: getBrand(useAppStore.getState().purses, 'BLD') as Brand<'nat'>, 
-        value: 0n 
-      } : undefined,
-      detail: {}
+      fee: getBrand(useAppStore.getState().purses, 'BLD')
+        ? {
+            brand: getBrand(
+              useAppStore.getState().purses,
+              'BLD',
+            ) as Brand<'nat'>,
+            value: 0n,
+          }
+        : undefined,
+      detail: {},
     },
-    { 
-      src: '@agoric', 
-      dest: '<Cash>', 
+    {
+      src: '@agoric',
+      dest: '<Cash>',
       amount,
-      fee: getBrand(useAppStore.getState().purses, 'BLD') ? { 
-        brand: getBrand(useAppStore.getState().purses, 'BLD') as Brand<'nat'>, 
-        value: 0n 
-      } : undefined,
-      detail: {}
+      fee: getBrand(useAppStore.getState().purses, 'BLD')
+        ? {
+            brand: getBrand(
+              useAppStore.getState().purses,
+              'BLD',
+            ) as Brand<'nat'>,
+            value: 0n,
+          }
+        : undefined,
+      detail: {},
     },
   ];
   wallet?.makeOffer(
@@ -412,6 +442,7 @@ const withdrawFromProtocol = (
           dest: `@${chain}`,
           amount,
           fee: defaultFee,
+          detail: { evmGas: 200_000_000_000_000n },
         },
         { src: `@${chain}`, dest: '@noble', amount, fee: defaultFee },
         { src: '@noble', dest: '@agoric', amount },
@@ -436,11 +467,20 @@ const withdrawFromProtocol = (
             brand: usdcBrand as Brand<'nat'>,
             value: customStep.movement.amount.value,
           },
-          fee: customStep.movement.fee || (getBrand(useAppStore.getState().purses, 'BLD') ? { 
-            brand: getBrand(useAppStore.getState().purses, 'BLD') as Brand<'nat'>, 
-            value: 40n 
-          } : undefined),
-          detail: customStep.movement.detail || { evmGas: 200_000_000_000_000n },
+          fee:
+            customStep.movement.fee ||
+            (getBrand(useAppStore.getState().purses, 'BLD')
+              ? {
+                  brand: getBrand(
+                    useAppStore.getState().purses,
+                    'BLD',
+                  ) as Brand<'nat'>,
+                  value: 40n,
+                }
+              : undefined),
+          detail: customStep.movement.detail || {
+            evmGas: 200_000_000_000_000n,
+          },
         };
         customMovements.push(movement);
       }
@@ -741,6 +781,9 @@ const MainPage = () => {
   const [environment, setEnvironment] = useState<Environment>(
     getInitialEnvironment(),
   );
+  const [contractVersion, setContractVersion] = useState<ContractVersion>(
+    (localStorage.getItem('contractVersion') as ContractVersion) || 'ymax0',
+  );
 
   const { wallet, purses, offerId } = useAppStore((state: AppState) => ({
     wallet: state.wallet,
@@ -770,6 +813,22 @@ const MainPage = () => {
     }
   };
 
+  const handleContractVersionChange = (newVersion: ContractVersion) => {
+    setContractVersion(newVersion);
+    localStorage.setItem('contractVersion', newVersion);
+
+    // Re-run setup to update the contract instance
+    setup(newVersion);
+
+    // If wallet was connected, notify user
+    if (wallet) {
+      alert(
+        `Contract version changed to ${newVersion}. The page will reload to apply changes.`,
+      );
+      window.location.reload();
+    }
+  };
+
   return (
     <>
       {/* Top header with logo and wallet status */}
@@ -816,6 +875,8 @@ const MainPage = () => {
         <div className="main-content">
           <div className="card">
             <Trade
+              contractVersion={contractVersion}
+              onContractVersionChange={handleContractVersionChange}
               makeOffer={(
                 usdcAmount,
                 bldFeeAmount,
@@ -866,9 +927,13 @@ const MainPage = () => {
 };
 
 function App() {
+  const [contractVersion] = useState<ContractVersion>(
+    (localStorage.getItem('contractVersion') as ContractVersion) || 'ymax0',
+  );
+
   useEffect(() => {
-    setup();
-  }, []);
+    setup(contractVersion);
+  }, [contractVersion]);
 
   const { wallet, instances, purses } = useAppStore((state: AppState) => ({
     wallet: state.wallet,
@@ -890,6 +955,7 @@ function App() {
             purses={purses}
             keplr={(window as any).keplr}
             chainId={ENDPOINTS.CHAIN_ID}
+            contractVersion={contractVersion}
           />
         }
       />
diff --git a/ui/src/components/Admin.tsx b/ui/src/components/Admin.tsx
index 762568c..17bf9af 100644
--- a/ui/src/components/Admin.tsx
+++ b/ui/src/components/Admin.tsx
@@ -4,6 +4,7 @@ import { makeVstorageKit, makeVStorage } from '@agoric/client-utils';
 import { makeAgoricChainStorageWatcher, AgoricChainStoragePathKind as Kind } from '@agoric/rpc';
 import { reifyWalletEntry } from '../walletEntryProxy';
 import type { Environment } from '../types';
+import { ContractVersion } from '../constants';
 import WalletEntriesCard from './WalletEntriesCard';
 import ContractControlCard from './ContractControlCard';
 import CreatorFacetCard from './CreatorFacetCard';
@@ -19,6 +20,7 @@ type AdminProps = {
   purses?: Array<Purse>;
   keplr?: any;
   chainId?: string;
+  contractVersion?: ContractVersion;
 };
 
 const Admin: React.FC<AdminProps> = ({
@@ -29,10 +31,11 @@ const Admin: React.FC<AdminProps> = ({
   purses,
   keplr,
   chainId,
+  contractVersion = 'ymax0',
 }) => {
   const [transactions, setTransactions] = useState<any[]>([]);
   const [instanceInfo, setInstanceInfo] = useState<{
-    ymax0?: string;
+    contract?: string;
     postalService?: string;
   } | null>(null);
   const [instanceBlockHeight, setInstanceBlockHeight] = useState<string | null>(null);
@@ -101,8 +104,8 @@ const Admin: React.FC<AdminProps> = ({
 
     try {
       // Get board ID for target confirmation
-      const ymax0Instance = instanceInfo?.ymax0 ? instances?.find(([n]) => n === 'ymax0')?.[1] : null;
-      const [boardId] = ymax0Instance ? watcherRef.current.marshaller.toCapData(ymax0Instance).slots : [''];
+      const contractInstance = instanceInfo?.contract ? instances?.find(([n]) => n === contractVersion)?.[1] : null;
+      const [boardId] = contractInstance ? watcherRef.current.marshaller.toCapData(contractInstance).slots : [''];
       
       const { target, tools } = reifyWalletEntry<{ terminate: (args?: { message?: string; target?: string }) => Promise<any> }>({
         targetName: 'ymaxControl',
@@ -377,9 +380,9 @@ const Admin: React.FC<AdminProps> = ({
           return instancePair ? String(instancePair[1]) : undefined;
         };
 
-        const ymax0 = findInstance('ymax0');
+        const contract = findInstance(contractVersion);
         const postalService = findInstance('postalService');
-        setInstanceInfo({ ymax0, postalService });
+        setInstanceInfo({ contract, postalService });
       },
     );
 
@@ -614,6 +617,7 @@ const Admin: React.FC<AdminProps> = ({
           onTerminate={handleTerminate}
           onUpgrade={handleUpgrade}
           onInstallAndStart={handleInstallAndStart}
+          contractVersion={contractVersion}
         />
 
         <CreatorFacetCard
diff --git a/ui/src/components/ContractControlCard.tsx b/ui/src/components/ContractControlCard.tsx
index c033c84..e2c5330 100644
--- a/ui/src/components/ContractControlCard.tsx
+++ b/ui/src/components/ContractControlCard.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 interface ContractControlCardProps {
-  instanceInfo: { ymax0?: string; postalService?: string } | null;
+  instanceInfo: { contract?: string; postalService?: string } | null;
   instanceBlockHeight: string | null;
   creatorFacetName: string;
   setCreatorFacetName: (value: string) => void;
@@ -16,10 +16,12 @@ interface ContractControlCardProps {
   onTerminate: () => void;
   onUpgrade: () => void;
   onInstallAndStart: () => void;
+  contractVersion?: string;
 }
 
 const ContractControlCard: React.FC<ContractControlCardProps> = ({
   instanceInfo,
+  contractVersion = 'ymax0',
   instanceBlockHeight,
   creatorFacetName,
   setCreatorFacetName,
@@ -37,16 +39,16 @@ const ContractControlCard: React.FC<ContractControlCardProps> = ({
 }) => {
   return (
     <div style={{ border: '2px solid #007bff', padding: '1rem', borderRadius: '8px', backgroundColor: '#f8f9fa' }}>
-      <h3 style={{ color: '#007bff', marginTop: 0, textAlign: 'left' }}>YMax Contract Control</h3>
-      
+      <h3 style={{ color: '#007bff', marginTop: 0, textAlign: 'left' }}>YMax Contract Control ({contractVersion})</h3>
+
       <div style={{ display: 'flex', gap: '2rem', alignItems: 'flex-start' }}>
         {/* Left: Instance Info */}
         <div style={{ flex: '0 0 300px' }}>
-          {instanceInfo?.ymax0 && (
+          {instanceInfo?.contract && (
             <div style={{ marginBottom: '0.5rem' }}>
-              <strong>Instance:</strong> {instanceInfo.ymax0}{' '}
+              <strong>Instance:</strong> {instanceInfo.contract}{' '}
               <button
-                onClick={() => navigator.clipboard.writeText(instanceInfo.ymax0!)}
+                onClick={() => navigator.clipboard.writeText(instanceInfo.contract!)}
                 style={{ background: 'none', border: 'none', cursor: 'pointer', padding: '0' }}
                 title="Copy instance"
               >
diff --git a/ui/src/components/Trade.tsx b/ui/src/components/Trade.tsx
index 235b3e9..ed66c9d 100644
--- a/ui/src/components/Trade.tsx
+++ b/ui/src/components/Trade.tsx
@@ -14,8 +14,11 @@ import {
   fetchAllTransactions,
   PendingTransaction,
 } from '../utils/walletUtils';
+import { ContractVersion } from '../constants';
 
 type TradeProps = {
+  contractVersion: ContractVersion;
+  onContractVersionChange: (version: ContractVersion) => void;
   makeOffer: (
     usdcAmount: bigint,
     bldFeeAmount: bigint,
@@ -52,6 +55,8 @@ type TradeProps = {
 
 // Simplified Trade component with customizable USDC and BLD fee amounts
 const Trade = ({
+  contractVersion,
+  onContractVersionChange,
   makeOffer,
   withdrawUSDC,
   withdrawFromProtocol,
@@ -197,27 +202,27 @@ const Trade = ({
   // Fetch transactions only once when watcher becomes available
   useEffect(() => {
     let isCancelled = false;
-    
+
     const fetchTransactions = async () => {
       if (watcher && !isLoadingTransactions && !isCancelled && allTransactions.length === 0) {
         console.log('Loading transactions from blockchain...');
         setIsLoadingTransactions(true);
         try {
-          const transactions = await fetchAllTransactions(watcher);
-          
+          const transactions = await fetchAllTransactions(watcher, contractVersion);
+
           if (isCancelled) {
             return;
           }
-          
+
           console.log(`Loaded ${transactions.length} transactions from blockchain`);
           setAllTransactions(transactions);
-          
+
           // Filter based on checkbox state
-          const filteredTransactions = showOnlyPending 
+          const filteredTransactions = showOnlyPending
             ? transactions.filter(tx => tx.status === 'pending')
             : transactions;
           setPendingTransactions(filteredTransactions);
-          
+
           // If we have transactions and no txId is set, set the first one
           if (filteredTransactions.length > 0 && !txId) {
             setTxId(filteredTransactions[0].id);
@@ -238,13 +243,13 @@ const Trade = ({
     // Add a delay to ensure watcher is ready, but only run once
     if (watcher && allTransactions.length === 0) {
       const timeoutId = setTimeout(fetchTransactions, 2000);
-      
+
       return () => {
         isCancelled = true;
         clearTimeout(timeoutId);
       };
     }
-  }, [watcher]); // Only depend on watcher
+  }, [watcher, contractVersion]); // Also depend on contractVersion
   
   // Filter transactions when checkbox state changes
   useEffect(() => {
@@ -324,12 +329,12 @@ const Trade = ({
       setIsLoadingTransactions(true);
       try {
         console.log('Refreshing transactions from blockchain...');
-        const transactions = await fetchAllTransactions(watcher);
+        const transactions = await fetchAllTransactions(watcher, contractVersion);
         console.log(`Refreshed ${transactions.length} transactions`);
         setAllTransactions(transactions);
-        
+
         // Filter based on current checkbox state
-        const filteredTransactions = showOnlyPending 
+        const filteredTransactions = showOnlyPending
           ? transactions.filter(tx => tx.status === 'pending')
           : transactions;
         setPendingTransactions(filteredTransactions);
@@ -352,11 +357,11 @@ const Trade = ({
 
     console.log('=== TESTING VSTORAGE PATHS ===');
     const testPaths = [
-      { path: 'published.ymax0.pendingTxs', kind: Kind.Children },
-      { path: 'published.ymax0.pendingTxs', kind: Kind.Data },
-      { path: 'published.ymax0', kind: Kind.Data },
-      { path: 'published.ymax0.pendingTxs.tx0', kind: Kind.Data },
-      { path: 'published.ymax0.transactions', kind: Kind.Children },
+      { path: `published.${contractVersion}.pendingTxs`, kind: Kind.Children },
+      { path: `published.${contractVersion}.pendingTxs`, kind: Kind.Data },
+      { path: `published.${contractVersion}`, kind: Kind.Data },
+      { path: `published.${contractVersion}.pendingTxs.tx0`, kind: Kind.Data },
+      { path: `published.${contractVersion}.transactions`, kind: Kind.Children },
     ];
 
     for (const testPath of testPaths) {
@@ -955,7 +960,7 @@ const Trade = ({
           {pendingTransactions.length === 0 && !isLoadingTransactions && (
             <div className="transaction-status">
               <p><strong>Status:</strong> No pending transactions found in blockchain storage.</p>
-              <p><small>The vstorage path <code>published.ymax0.pendingTxs</code> exists but contains no data yet.</small></p>
+              <p><small>The vstorage path <code>published.{contractVersion}.pendingTxs</code> exists but contains no data yet.</small></p>
             </div>
           )}
 
@@ -1033,8 +1038,27 @@ const Trade = ({
   return (
     <div className="trade-container">
       <div className="page-header">
-        <h1>ymax-dev-ui</h1>
-        <p className="page-subtitle">Yield Maximization Protocol Interface</p>
+        <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '10px' }}>
+          <div>
+            <h1>ymax-dev-ui</h1>
+            <p className="page-subtitle">Yield Maximization Protocol Interface</p>
+          </div>
+          <div className="contract-version-selector">
+            <label htmlFor="contract-version" style={{ marginRight: '10px', fontWeight: 'bold' }}>
+              Contract:
+            </label>
+            <select
+              id="contract-version"
+              value={contractVersion}
+              onChange={(e) => onContractVersionChange(e.target.value as ContractVersion)}
+              className="chain-selector"
+              style={{ minWidth: '120px' }}
+            >
+              <option value="ymax0">ymax0 (Dev)</option>
+              <option value="ymax1">ymax1 (Prod)</option>
+            </select>
+          </div>
+        </div>
       </div>
 
       <Tabs tabs={tabs} defaultTab="open-position" />
diff --git a/ui/src/constants.ts b/ui/src/constants.ts
index 394586e..d69c569 100644
--- a/ui/src/constants.ts
+++ b/ui/src/constants.ts
@@ -20,9 +20,12 @@ export const BRAND_NAMES = {
 } as const;
 
 export const CONTRACT_NAMES = {
-  YMAX: 'ymax0',
+  YMAX_DEV: 'ymax0',
+  YMAX_PROD: 'ymax1',
 } as const;
 
+export type ContractVersion = 'ymax0' | 'ymax1';
+
 export const CHAINS = {
   AGORIC_DEV: 'agoricdev-25',
 } as const;
diff --git a/ui/src/utils/stepUtils.ts b/ui/src/utils/stepUtils.ts
index 5a533c5..16a693d 100644
--- a/ui/src/utils/stepUtils.ts
+++ b/ui/src/utils/stepUtils.ts
@@ -64,6 +64,7 @@ export const generateOpenPositionSteps = (
           dest: `@${evmChain}`,
           amount: { brand: {} as Brand<'nat'>, value: usdcAmount },
           fee: { brand: {} as Brand<'nat'>, value: 2_000_000n },
+          detail: { evmGas: 200_000_000_000_000n },
         },
       });
 
@@ -76,6 +77,7 @@ export const generateOpenPositionSteps = (
           dest: `${yieldProtocol}_${evmChain}`,
           amount: { brand: {} as Brand<'nat'>, value: usdcAmount },
           fee: { brand: {} as Brand<'nat'>, value: 2_000_000n },
+          detail: { evmGas: 200_000_000_000_000n },
         },
       });
       break;
@@ -116,6 +118,7 @@ export const generateWithdrawSteps = (
           dest: `@${evmChain}`,
           amount: { brand: {} as Brand<'nat'>, value: withdrawAmount },
           fee: { brand: {} as Brand<'nat'>, value: 15_000_000n },
+          detail: { evmGas: 200_000_000_000_000n },
         },
       });
 
@@ -128,6 +131,7 @@ export const generateWithdrawSteps = (
           dest: '@noble',
           amount: { brand: {} as Brand<'nat'>, value: withdrawAmount },
           fee: { brand: {} as Brand<'nat'>, value: 15_000_000n },
+          detail: { evmGas: 200_000_000_000_000n },
         },
       });
       break;
@@ -164,15 +168,13 @@ export const filterMovementsBySelectedSteps = (
   selectedStepIds: string[],
   allSteps: StepInfo[],
 ): MovementDesc[] => {
-  return originalMovements.filter((movement) => {
+  return originalMovements.filter(movement => {
     const correspondingStep = allSteps.find(
-      (step) =>
+      step =>
         step.movement &&
         step.movement.src === movement.src &&
         step.movement.dest === movement.dest,
     );
-    return (
-      !correspondingStep || selectedStepIds.includes(correspondingStep.id)
-    );
+    return !correspondingStep || selectedStepIds.includes(correspondingStep.id);
   });
-};
\ No newline at end of file
+};
diff --git a/ui/src/utils/walletUtils.ts b/ui/src/utils/walletUtils.ts
index 29c5ff2..5869fae 100644
--- a/ui/src/utils/walletUtils.ts
+++ b/ui/src/utils/walletUtils.ts
@@ -2,6 +2,7 @@ import {
   makeAgoricChainStorageWatcher,
   AgoricChainStoragePathKind as Kind,
 } from '@agoric/rpc';
+import { ContractVersion } from '../constants';
 
 export type WalletState = {
   liveOffers: Array<[string, any]>;
@@ -353,11 +354,12 @@ export const parseTransactionEntry = (entry: any): PendingTransaction | null =>
 const fetchIndividualTransaction = async (
   watcher: ReturnType<typeof makeAgoricChainStorageWatcher>,
   txId: string,
+  contractVersion: ContractVersion,
 ): Promise<PendingTransaction | null> => {
   return new Promise((resolve, reject) => {
     let isResolved = false;
     let unsubscribe: (() => void) | null = null;
-    
+
     const cleanup = () => {
       if (unsubscribe && !isResolved) {
         try {
@@ -381,7 +383,7 @@ const fetchIndividualTransaction = async (
     };
 
     try {
-      const path = `published.ymax0.pendingTxs.${txId}`;
+      const path = `published.${contractVersion}.pendingTxs.${txId}`;
       console.log(`Fetching individual transaction data from: ${path}`);
 
       unsubscribe = watcher.watchLatest<any>(
@@ -447,15 +449,16 @@ const fetchIndividualTransaction = async (
 };
 
 /**
- * Fetches all transactions from ymax0 vstorage path
+ * Fetches all transactions from vstorage path
  */
 export const fetchAllTransactions = async (
   watcher: ReturnType<typeof makeAgoricChainStorageWatcher>,
+  contractVersion: ContractVersion,
 ): Promise<PendingTransaction[]> => {
   return new Promise((resolve, reject) => {
     let isResolved = false;
     let unsubscribe: (() => void) | null = null;
-    
+
     const cleanup = () => {
       if (unsubscribe && !isResolved) {
         try {
@@ -487,7 +490,7 @@ export const fetchAllTransactions = async (
     };
 
     try {
-      const path = 'published.ymax0.pendingTxs';
+      const path = `published.${contractVersion}.pendingTxs`;
       console.log('Watching all transactions at path:', path);
 
       // Use watchLatest to get the current state
@@ -546,7 +549,7 @@ export const fetchAllTransactions = async (
                   if (typeof item === 'string' && item.startsWith('tx')) {
                     const txId = item;
                     console.log(`Fetching individual data for transaction ID: ${txId}`);
-                    return await fetchIndividualTransaction(watcher, txId);
+                    return await fetchIndividualTransaction(watcher, txId, contractVersion);
                   } else {
                     // If the item is already transaction data, parse it normally
                     const txId = `tx${index}`;
@@ -648,9 +651,11 @@ export const fetchAllTransactions = async (
 export const testVstoragePath = async (
   watcher: ReturnType<typeof makeAgoricChainStorageWatcher>,
   walletAddress: string,
+  contractVersion: ContractVersion = 'ymax0',
 ): Promise<void> => {
   console.log('=== TESTING VSTORAGE PATHS ===');
   console.log('Wallet address:', walletAddress);
+  console.log('Contract version:', contractVersion);
 
   // Test different path formats
   const testPaths = [
@@ -658,7 +663,7 @@ export const testVstoragePath = async (
     `published.wallet.${walletAddress}`,
     `wallet.${walletAddress}.current`,
     `wallet.${walletAddress}`,
-    'published.ymax0.pendingTxs',
+    `published.${contractVersion}.pendingTxs`,
   ];
 
   for (const path of testPaths) {
diff --git a/ui/src/ymax-client.ts b/ui/src/ymax-client.ts
index 697babf..4505239 100644
--- a/ui/src/ymax-client.ts
+++ b/ui/src/ymax-client.ts
@@ -79,12 +79,14 @@ export const makePortfolioSteps = <
           dest: `@${evm}`,
           amount,
           fee: fees[p].Account,
+          detail: { evmGas: 200_000_000_000_000n },
         });
         steps.push({
           src: `@${evm}`,
           dest: `${p}_${evm}`,
           amount,
           fee: fees[p].Call,
+          detail: { evmGas: 200_000_000_000_000n },
         });
         break;
       default: