Merge pull request #2347 from blockscout/fe-2332

support wei variable in interpretation
blockscout · Nov 4, 2024 · 625b4d7 · 625b4d7
2 parents 8561afc + 18d94ef
commit 625b4d7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/ui/shared/tx/interpretation/TxInterpretation.tsx b/ui/shared/tx/interpretation/TxInterpretation.tsx
@@ -19,7 +19,14 @@ import EnsEntity from 'ui/shared/entities/ens/EnsEntity';
 import TokenEntity from 'ui/shared/entities/token/TokenEntity';
 import IconSvg from 'ui/shared/IconSvg';
 
-import { extractVariables, getStringChunks, fillStringVariables, checkSummary, NATIVE_COIN_SYMBOL_VAR_NAME } from './utils';
+import {
+  extractVariables,
+  getStringChunks,
+  fillStringVariables,
+  checkSummary,
+  NATIVE_COIN_SYMBOL_VAR_NAME,
+  WEI_VAR_NAME,
+} from './utils';
 
 type Props = {
   summary?: TxInterpretationSummary;
@@ -152,19 +159,23 @@ const TxInterpretation = ({ summary, isLoading, addressDataMap, className }: Pro
         <IconSvg name="lightning" boxSize={ 5 } color="text_secondary" mr={ 1 } verticalAlign="text-top"/>
       </Tooltip>
       { chunks.map((chunk, index) => {
+        let content = null;
+        if (variablesNames[index] === NATIVE_COIN_SYMBOL_VAR_NAME) {
+          content = <chakra.span>{ currencyUnits.ether + ' ' }</chakra.span>;
+        } else if (variablesNames[index] === WEI_VAR_NAME) {
+          content = <chakra.span>{ currencyUnits.wei + ' ' }</chakra.span>;
+        } else {
+          content = (
+            <TxInterpretationElementByType
+              variable={ variables[variablesNames[index]] as NonStringTxInterpretationVariable }
+              addressDataMap={ addressDataMap }
+            />
+          );
+        }
         return (
           <chakra.span key={ chunk + index }>
             <chakra.span color="text_secondary">{ chunk.trim() + (chunk.trim() && variablesNames[index] ? ' ' : '') }</chakra.span>
-            { index < variablesNames.length && (
-              variablesNames[index] === NATIVE_COIN_SYMBOL_VAR_NAME ?
-                <chakra.span>{ currencyUnits.ether + ' ' }</chakra.span> :
-                (
-                  <TxInterpretationElementByType
-                    variable={ variables[variablesNames[index]] as NonStringTxInterpretationVariable }
-                    addressDataMap={ addressDataMap }
-                  />
-                )
-            ) }
+            { index < variablesNames.length && content }
           </chakra.span>
         );
       }) }

diff --git a/ui/shared/tx/interpretation/utils.test.ts b/ui/shared/tx/interpretation/utils.test.ts
@@ -13,7 +13,7 @@ it('split string without capturing variables', () => {
 });
 
 it('checks that summary is valid', () => {
-  const result = checkSummary('{foo} {native} {bar}', { foo: { type: 'string', value: 'foo' }, bar: { type: 'string', value: 'bar' } });
+  const result = checkSummary('{foo} {native} {bar} {wei}', { foo: { type: 'string', value: 'foo' }, bar: { type: 'string', value: 'bar' } });
   expect(result).toBe(true);
 });
 

diff --git a/ui/shared/tx/interpretation/utils.ts b/ui/shared/tx/interpretation/utils.ts
@@ -6,6 +6,7 @@ import type { TxInterpretationVariable } from 'types/api/txInterpretation';
 export const VAR_REGEXP = /\{(?:[^}]+)\}/g;
 
 export const NATIVE_COIN_SYMBOL_VAR_NAME = 'native';
+export const WEI_VAR_NAME = 'wei';
 
 export function extractVariables(templateString: string) {
 
@@ -24,7 +25,7 @@ export function checkSummary(template: string, variables: Record<string, TxInter
   const variablesNames = extractVariables(template);
   let result = true;
   for (const name of variablesNames) {
-    if (name === NATIVE_COIN_SYMBOL_VAR_NAME) {
+    if (name === NATIVE_COIN_SYMBOL_VAR_NAME || name === WEI_VAR_NAME) {
       continue;
     }
     if (!variables[name] || variables[name].value === undefined || variables[name].value === null) {