merge

MetaMask · Jun 19, 2024 · b0b36b8 · b0b36b8
1 parent b6ddf18
commit b0b36b8
Show file tree

Hide file tree

Showing 10 changed files with 109 additions and 38 deletions.
diff --git a/...s/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap b/...s/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
@@ -406,16 +406,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
                   Value:
                 </p>
               </div>
-              <div
-                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
-              >
-                <p
-                  class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-                  style="white-space: pre-wrap;"
-                >
-                  3000
-                </p>
-              </div>
+              3,000
             </div>
             <div
               class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"

diff --git a/...s/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap b/...s/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
@@ -69,7 +69,7 @@ exports[`PermitSimulation renders component correctly 1`] = `
             <p
               class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--padding-inline-2 mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-xl"
             >
-              3000
+              30.00
             </p>
           </div>
           <div>

diff --git a/...irmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.test.tsx b/...irmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.test.tsx
@@ -15,7 +15,10 @@ describe('PermitSimulation', () => {
       },
     };
     const mockStore = configureMockStore([])(state);
-    const { container } = renderWithProvider(<PermitSimulation />, mockStore);
+    const { container } = renderWithProvider(
+      <PermitSimulation tokenDecimals={2} />,
+      mockStore,
+    );
     expect(container).toMatchSnapshot();
   });
 });
diff --git a/.../confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx b/.../confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
@@ -21,8 +21,11 @@ import {
 import { SignatureRequestType } from '../../../../../types/confirm';
 import useTokenExchangeRate from '../../../../../../../components/app/currency-input/hooks/useTokenExchangeRate';
 import { IndividualFiatDisplay } from '../../../../simulation-details/fiat-display';
+import { formatNumber } from '../../../utils';
 
-const PermitSimulation: React.FC = () => {
+const PermitSimulation: React.FC<{
+  tokenDecimals: number;
+}> = ({ tokenDecimals }) => {
   const t = useI18nContext();
   const currentConfirmation = useSelector(
     currentConfirmationSelector,
@@ -65,7 +68,10 @@ const PermitSimulation: React.FC = () => {
                 paddingInline={2}
                 textAlign={TextAlign.Center}
               >
-                {value}
+                {formatNumber(
+                  value / Math.pow(10, tokenDecimals),
+                  tokenDecimals,
+                )}
               </Text>
             </Box>
             <Name value={verifyingContract} type={NameType.ETHEREUM_ADDRESS} />

diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.test.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.test.tsx
@@ -10,6 +10,12 @@ import {
 } from '../../../../../../../test/data/confirmations/typed_sign';
 import TypedSignInfo from './typed-sign';
 
+jest.mock('../../../../../../store/actions', () => {
+  return {
+    getTokenStandardAndDetails: jest.fn().mockResolvedValue({ decimals: 2 }),
+  };
+});
+
 describe('TypedSignInfo', () => {
   it('renders origin for typed sign data request', () => {
     const state = {

diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { isValidAddress } from 'ethereumjs-util';
 
@@ -16,6 +16,7 @@ import {
   BackgroundColor,
   BorderRadius,
 } from '../../../../../../helpers/constants/design-system';
+import { getTokenStandardAndDetails } from '../../../../../../store/actions';
 import { SignatureRequestType } from '../../../../types/confirm';
 import { isPermitSignatureRequest } from '../../../../utils';
 import { selectUseTransactionSimulations } from '../../../../selectors/preferences';
@@ -30,6 +31,7 @@ const TypedSignInfo: React.FC = () => {
   const useTransactionSimulations = useSelector(
     selectUseTransactionSimulations,
   );
+  const [decimals, setDecimals] = useState<number>(0);
 
   if (!currentConfirmation?.msgParams) {
     return null;
@@ -42,9 +44,23 @@ const TypedSignInfo: React.FC = () => {
 
   const isPermit = isPermitSignatureRequest(currentConfirmation);
 
+  useEffect(() => {
+    (async () => {
+      if (!isPermit) {
+        return;
+      }
+      const { decimals: tokenDecimals } = await getTokenStandardAndDetails(
+        verifyingContract,
+      );
+      setDecimals(parseInt(tokenDecimals ?? '0', 10));
+    })();
+  }, [verifyingContract]);
+
   return (
     <>
-      {isPermit && useTransactionSimulations && <PermitSimulation />}
+      {isPermit && useTransactionSimulations && (
+        <PermitSimulation tokenDecimals={decimals} />
+      )}
       <Box
         backgroundColor={BackgroundColor.backgroundDefault}
         borderRadius={BorderRadius.MD}
@@ -87,6 +103,7 @@ const TypedSignInfo: React.FC = () => {
           <ConfirmInfoRowTypedSignData
             data={currentConfirmation.msgParams?.data as string}
             isPermit={isPermit}
+            tokenDecimals={decimals}
           />
         </ConfirmInfoRow>
       </Box>

diff --git a/ui/pages/confirmations/components/confirm/row/dataTree.tsx b/ui/pages/confirmations/components/confirm/row/dataTree.tsx
@@ -11,6 +11,7 @@ import {
   ConfirmInfoRowDate,
   ConfirmInfoRowText,
 } from '../../../../../components/app/confirm/info/row';
+import { formatNumber } from '../utils';
 
 type ValueType = string | Record<string, TreeData> | TreeData[];
 
@@ -22,9 +23,11 @@ export type TreeData = {
 export const DataTree = ({
   data,
   isPermit = false,
+  tokenDecimals = 0,
 }: {
   data: Record<string, TreeData> | TreeData[];
   isPermit?: boolean;
+  tokenDecimals?: number;
 }) => (
   <Box width={BlockSize.Full}>
     {Object.entries(data).map(([label, { value, type }], i) => (
@@ -42,6 +45,7 @@ export const DataTree = ({
             isPermit={isPermit}
             value={value}
             type={type}
+            tokenDecimals={tokenDecimals}
           />
         }
       </ConfirmInfoRow>
@@ -54,14 +58,32 @@ const DataField = ({
   isPermit,
   type,
   value,
+  tokenDecimals,
 }: {
   label: string;
   isPermit: boolean;
   type: string;
   value: ValueType;
+  tokenDecimals: number;
 }) => {
   if (typeof value === 'object' && value !== null) {
-    return <DataTree data={value} isPermit={isPermit} />;
+    return (
+      <DataTree
+        data={value}
+        isPermit={isPermit}
+        tokenDecimals={tokenDecimals}
+      />
+    );
+  }
+  if (isPermit && label === 'value') {
+    return (
+      <ConfirmInfoRowText
+        text={formatNumber(
+          parseInt(value, 10) / Math.pow(10, tokenDecimals),
+          tokenDecimals,
+        )}
+      />
+    );
   }
   if (isPermit && label === 'deadline') {
     return <ConfirmInfoRowDate date={parseInt(value, 10)} />;

diff --git a/ui/pages/confirmations/components/confirm/row/typed-sign-data/typedSignData.tsx b/ui/pages/confirmations/components/confirm/row/typed-sign-data/typedSignData.tsx
@@ -7,16 +7,17 @@ import {
   ConfirmInfoRow,
   ConfirmInfoRowText,
 } from '../../../../../../components/app/confirm/info/row';
-
-import { DataTree } from '../dataTree';
 import { parseSanitizeTypedDataMessage } from '../../../../utils';
+import { DataTree } from '../dataTree';
 
 export const ConfirmInfoRowTypedSignData = ({
   data,
   isPermit,
+  tokenDecimals,
 }: {
   data: string;
   isPermit?: boolean;
+  tokenDecimals?: number;
 }) => {
   const t = useI18nContext();
 
@@ -35,7 +36,11 @@ export const ConfirmInfoRowTypedSignData = ({
         <ConfirmInfoRowText text={primaryType} />
       </ConfirmInfoRow>
       <Box style={{ marginLeft: -8 }}>
-        <DataTree data={sanitizedMessage.value} isPermit={isPermit} />
+        <DataTree
+          data={sanitizedMessage.value}
+          isPermit={isPermit}
+          tokenDecimals={tokenDecimals}
+        />
       </Box>
     </Box>
   );

diff --git a/ui/pages/confirmations/components/confirm/utils.test.ts b/ui/pages/confirmations/components/confirm/utils.test.ts
@@ -8,29 +8,39 @@ import {
   unapprovedPersonalSignMsg,
 } from '../../../../../test/data/confirmations/personal_sign';
 import { SignatureRequestType } from '../../types/confirm';
-import { getConfirmationSender } from './utils';
+import { formatNumber, getConfirmationSender } from './utils';
 
-describe('getConfirmationSender()', () => {
-  test("returns the sender address from a signature if it's passed", () => {
-    const testCurrentConfirmation =
-      genUnapprovedContractInteractionConfirmation() as TransactionMeta;
-    const { from } = getConfirmationSender(testCurrentConfirmation);
+describe('confirm - utils', () => {
+  describe('getConfirmationSender()', () => {
+    test("returns the sender address from a signature if it's passed", () => {
+      const testCurrentConfirmation =
+        genUnapprovedContractInteractionConfirmation() as TransactionMeta;
+      const { from } = getConfirmationSender(testCurrentConfirmation);
 
-    expect(from).toEqual(CONTRACT_INTERACTION_SENDER_ADDRESS);
-  });
+      expect(from).toEqual(CONTRACT_INTERACTION_SENDER_ADDRESS);
+    });
 
-  test("returns the sender address from a transaction if it's passed", () => {
-    const { from } = getConfirmationSender(
-      unapprovedPersonalSignMsg as SignatureRequestType,
-    );
+    test("returns the sender address from a transaction if it's passed", () => {
+      const { from } = getConfirmationSender(
+        unapprovedPersonalSignMsg as SignatureRequestType,
+      );
 
-    expect(from).toEqual(PERSONAL_SIGN_SENDER_ADDRESS);
-  });
+      expect(from).toEqual(PERSONAL_SIGN_SENDER_ADDRESS);
+    });
 
-  test('returns no sender address if no confirmation is passed', () => {
-    const testCurrentConfirmation = undefined;
-    const { from } = getConfirmationSender(testCurrentConfirmation);
+    test('returns no sender address if no confirmation is passed', () => {
+      const testCurrentConfirmation = undefined;
+      const { from } = getConfirmationSender(testCurrentConfirmation);
+
+      expect(from).toEqual(undefined);
+    });
+  });
 
-    expect(from).toEqual(undefined);
+  describe('formatNumber()', () => {
+    test('formats number according to decimal places passed', () => {
+      expect(formatNumber(123456, 2)).toEqual('123,456.00');
+      expect(formatNumber(123456, 0)).toEqual('123,456');
+      expect(formatNumber(123456, 7)).toEqual('123,456.0000000');
+    });
   });
 });
diff --git a/ui/pages/confirmations/components/confirm/utils.ts b/ui/pages/confirmations/components/confirm/utils.ts
@@ -17,3 +17,14 @@ export const getConfirmationSender = (
 
   return { from };
 };
+
+export const formatNumber = (value: number, decimals: number) => {
+  if (value === undefined) {
+    return value;
+  }
+  const formatter = new Intl.NumberFormat('en-US', {
+    minimumFractionDigits: decimals,
+    maximumFractionDigits: decimals,
+  });
+  return formatter.format(value);
+};