enterprisee tokens

Author: TheTrunk

src/components/VaultSignRequest/VaultSignRequest.tsx

@@ -43,6 +43,10 @@ interface VaultSignRequestProps {
   vaultName?: string;
   orgName?: string;
   actionStatus: (status: boolean) => void;
+  // ERC-20 token metadata (EVM only, omit for native currency)
+  tokenContract?: string;
+  tokenSymbol?: string;
+  tokenDecimals?: number;
 }
 
 const VaultSignRequest: React.FC<VaultSignRequestProps> = ({
@@ -55,6 +59,9 @@ const VaultSignRequest: React.FC<VaultSignRequestProps> = ({
   vaultName,
   orgName,
   actionStatus,
+  tokenContract,
+  tokenSymbol,
+  tokenDecimals,
 }) => {
   const { t } = useTranslation(['home', 'common']);
   const { Fonts, Gutters, Layout, Colors, Common } = useTheme();
@@ -65,6 +72,9 @@ const VaultSignRequest: React.FC<VaultSignRequestProps> = ({
     : chain;
   const chainDecimals = chainConfig?.decimals ?? 8;
   const chainSymbol = chainConfig?.symbol ?? chain.toUpperCase();
+  // For token transfers, use token decimals/symbol for amounts; fee always uses chain decimals/symbol
+  const amountDecimals = tokenDecimals != null ? tokenDecimals : chainDecimals;
+  const amountSymbol = tokenSymbol || chainSymbol;
 
   const approve = () => {
     console.log('Approve vault signing request');
@@ -262,7 +272,7 @@ const VaultSignRequest: React.FC<VaultSignRequestProps> = ({
                     { marginTop: 2 },
                   ]}
                 >
-                  {formatAmount(recipient.amount, chainDecimals)} {chainSymbol}
+                  {formatAmount(recipient.amount, amountDecimals)} {amountSymbol}
                 </Text>
               </View>
             ))}

src/screens/Home/Home.tsx

@@ -1361,6 +1361,26 @@ function Home({ navigation }: Props) {
         } else if (result.data.action === 'enterprisevaultsign') {
           try {
             const vaultSignData = JSON.parse(result.data.payload);
+            // Defensively parse fields that may arrive as JSON strings instead of arrays
+            // (e.g. from older wallet versions that double-stringified the payload)
+            if (typeof vaultSignData.recipients === 'string') {
+              vaultSignData.recipients = JSON.parse(vaultSignData.recipients);
+            }
+            if (typeof vaultSignData.inputDetails === 'string') {
+              vaultSignData.inputDetails = JSON.parse(
+                vaultSignData.inputDetails,
+              );
+            }
+            if (typeof vaultSignData.allSignerKeys === 'string') {
+              vaultSignData.allSignerKeys = JSON.parse(
+                vaultSignData.allSignerKeys,
+              );
+            }
+            if (typeof vaultSignData.allSignerNonces === 'string') {
+              vaultSignData.allSignerNonces = JSON.parse(
+                vaultSignData.allSignerNonces,
+              );
+            }
             setVaultSigningData(vaultSignData);
           } catch {
             displayMessage('error', t('home:err_invalid_request'));
@@ -2509,6 +2529,9 @@ function Home({ navigation }: Props) {
               vaultName={vaultSigningData.vaultName}
               orgName={vaultSigningData.orgName}
               actionStatus={handleVaultSigningRequestAction}
+              tokenContract={vaultSigningData.tokenContract}
+              tokenSymbol={vaultSigningData.tokenSymbol}
+              tokenDecimals={vaultSigningData.tokenDecimals}
             />
           )}
           {txid && (

src/types.d.ts

@@ -636,4 +636,8 @@ interface vaultSigningRequest {
     kPublic: string;
     kTwoPublic: string;
   }>;
+  // ERC-20 token metadata (EVM only, omit for native currency)
+  tokenContract?: string;
+  tokenSymbol?: string;
+  tokenDecimals?: number;
 }