fix: stored state causing wrong chart data

libs/assets/src/lib/constants.ts

@@ -62,10 +62,3 @@ export const DENY_LIST: Record<string, string[]> = {
     'fdf0ec118d98393a7702cf72e46fc87ad680b152f64b2aac59e093ac2d688fbb',
   ],
 };
-
-// We need a record of USDT on mainnet as it needs special handling for
-// deposits and approvals due to the contract not conforming exactly
-// to ERC20
-export const USDT_ID = {
-  MAINNET: 'bf1e88d19db4b3ca0d1d5bdb73718a01686b18cf731ca26adedf3c8b83802bba',
-} as const;

libs/deposits/src/lib/approve-notification.tsx

@@ -1,9 +1,5 @@
-import { USDT_ID, type Asset } from '@vegaprotocol/assets';
-import {
-  EtherscanLink,
-  Networks,
-  useEnvironment,
-} from '@vegaprotocol/environment';
+import type { Asset } from '@vegaprotocol/assets';
+import { EtherscanLink } from '@vegaprotocol/environment';
 import { Intent, Notification } from '@vegaprotocol/ui-toolkit';
 import {
   formatNumber,
@@ -19,7 +15,7 @@ import { useT } from './use-t';
 interface ApproveNotificationProps {
   isActive: boolean;
   selectedAsset?: Asset;
-  onApprove: (amount?: string) => void;
+  onApprove: () => void;
   approved: boolean;
   balances: DepositBalances | null;
   amount: string;
@@ -37,7 +33,6 @@ export const ApproveNotification = ({
   approveTxId,
   intent = Intent.Warning,
 }: ApproveNotificationProps) => {
-  const { VEGA_ENV } = useEnvironment();
   const t = useT();
   const tx = useEthTransactionStore((state) => {
     return state.transactions.find((t) => t?.id === approveTxId);
@@ -69,45 +64,28 @@ export const ApproveNotification = ({
           text: t('Approve {{assetSymbol}}', {
             assetSymbol: selectedAsset?.symbol,
           }),
-          action: () => onApprove(),
+          action: onApprove,
           dataTestId: 'approve-submit',
         }}
       />
     </div>
   );
-
-  let message = t('Approve again to deposit more than {{allowance}}', {
-    allowance: formatNumber(balances.allowance.toString()),
-  });
-  const buttonProps = {
-    size: 'small' as const,
-    text: t('Approve {{assetSymbol}}', {
-      assetSymbol: selectedAsset?.symbol,
-    }),
-    action: () => onApprove(),
-    dataTestId: 'reapprove-submit',
-  };
-
-  if (VEGA_ENV === Networks.MAINNET && selectedAsset.id === USDT_ID[VEGA_ENV]) {
-    message = t(
-      'USDT approved amount cannot be changed, only revoked. Revoke and reapprove to deposit more than {{allowance}}.',
-      {
-        allowance: formatNumber(balances.allowance.toString()),
-      }
-    );
-    buttonProps.text = t('Revoke {{assetSymbol}} approval', {
-      assetSymbol: selectedAsset?.symbol,
-    });
-    buttonProps.action = () => onApprove('0');
-  }
-
   const reApprovePrompt = (
     <div className="mb-4">
       <Notification
         intent={intent}
         testId="reapprove-default"
-        message={message}
-        buttonProps={buttonProps}
+        message={t('Approve again to deposit more than {{allowance}}', {
+          allowance: formatNumber(balances.allowance.toString()),
+        })}
+        buttonProps={{
+          size: 'small',
+          text: t('Approve {{assetSymbol}}', {
+            assetSymbol: selectedAsset?.symbol,
+          }),
+          action: onApprove,
+          dataTestId: 'reapprove-submit',
+        }}
       />
     </div>
   );

libs/deposits/src/lib/deposit-form.tsx

@@ -58,7 +58,7 @@ export interface DepositFormProps {
   onSelectAsset: (assetId: string) => void;
   handleAmountChange: (amount: string) => void;
   onDisconnect: () => void;
-  submitApprove: (amount?: string) => void;
+  submitApprove: () => void;
   approveTxId: number | null;
   submitFaucet: () => void;
   faucetTxId: number | null;
@@ -423,8 +423,8 @@ export const DepositForm = ({
         isActive={isActive}
         approveTxId={approveTxId}
         selectedAsset={selectedAsset}
-        onApprove={(amount) => {
-          submitApprove(amount);
+        onApprove={() => {
+          submitApprove();
           setApproveNotificationIntent(Intent.Warning);
         }}
         balances={balances}

libs/deposits/src/lib/use-submit-approval.ts

@@ -35,11 +35,11 @@ export const useSubmitApproval = (
     reset: () => {
       setId(null);
     },
-    perform: (amount?: string) => {
+    perform: () => {
       if (!asset || !config) return;
       const id = createEthTransaction(contract, 'approve', [
         config?.collateral_bridge_contract.address,
-        amount ? amount : MaxUint256.toString(),
+        MaxUint256.toString(),
       ]);
       setId(id);
     },

libs/i18n/src/locales/en/deposits.json

@@ -4,7 +4,6 @@
   "Approval failed": "Approval failed",
   "Approve {{assetSymbol}}": "Approve {{assetSymbol}}",
   "Approve again to deposit more than {{allowance}}": "Approve again to deposit more than {{allowance}}",
-  "USDT approved amount cannot be changed, only revoked. Revoke and reapprove to deposit more than {{allowance}}.": "USDT approved amount cannot be changed, only revoked. Revoke and reapprove to deposit more than {{allowance}}.",
   "Asset": "Asset",
   "Balance available": "Balance available",
   "Before you can make a deposit of your chosen asset, {{assetSymbol}}, you need to approve its use in your Ethereum wallet": "Before you can make a deposit of your chosen asset, {{assetSymbol}}, you need to approve its use in your Ethereum wallet",
@@ -24,7 +23,6 @@
   "Please select": "Please select",
   "Please select an asset": "Please select an asset",
   "Remaining deposit allowance": "Remaining deposit allowance",
-  "Revoke {{assetSymbol}} approval": "Revoke {{assetSymbol}} approval",
   "Select from wallet": "Select from wallet",
   "The {{symbol}} faucet is not available at this time": "The {{symbol}} faucet is not available at this time",
   "The deposit cap is set when you approve an asset for use with this app. To increase this cap, approve {{assetSymbol}} again and choose a higher cap. Check the documentation for your Ethereum wallet app for details.": "The deposit cap is set when you approve an asset for use with this app. To increase this cap, approve {{assetSymbol}} again and choose a higher cap. Check the documentation for your Ethereum wallet app for details.",

libs/web3/src/lib/use-ethereum-transaction-manager.tsx

@@ -27,7 +27,6 @@ export const useEthTransactionManager = () => {
       confirmations: 0,
       notify: true,
     });
-
     const {
       contract,
       methodName,
@@ -45,7 +44,6 @@ export const useEthTransactionManager = () => {
         ) {
           throw new Error('method not found on contract');
         }
-
         await contract.contract.callStatic[methodName](...args);
       } catch (err) {
         update(transaction.id, {