Merge pull request #12 from yongenaelf/fix/AELF_24359589

fix/AELF_24359589, fix/AELF_ 24659121: Disable close of modal popup on clicking outside and round off amount field in transaction list.
yongenaelf · Dec 4, 2023 · 173f0d7 · 173f0d7
2 parents fa79146 + e1817fd
commit 173f0d7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/components/transactions/components/AllTransactions.tsx b/components/transactions/components/AllTransactions.tsx
@@ -12,6 +12,7 @@ import { addressState } from "@/state";
 import PaperLayout from '@/components/common/paperLayout'
 import CopyToClipboard from '@/components/common/copyToClipboard'
 import {MIN_TRANSACTIONS_TO_SHOW_EXPLORER_LINK} from '@/utils/constants';
+import {roundNumber} from '@/utils';
 import rightArrowImage from '@/assets/icon/right-arrow.svg';
 import rightArrowSuccessImage from '@/assets/icon/right-arrow-success.svg';
 import { List } from "../../../app/transactions/route";
@@ -127,6 +128,9 @@ const AllTransactions = () => {
       title: "Amount",
       dataIndex: "amount",
       key: "amount",
+      render: (val) => (
+        roundNumber(val)
+      ),
     },
   ];
 

diff --git a/components/transactions/components/SendTransaction.tsx b/components/transactions/components/SendTransaction.tsx
@@ -318,6 +318,7 @@ function SendTransaction({
         onCancel={onClose}
         open={showSuccessModal} 
         centered width={442} 
+        maskClosable={false}
         footer={() => <Button type="primary" onClick={onClose} block>Close</Button>}>
         <Result
           status="success"
@@ -329,6 +330,7 @@ function SendTransaction({
         onCancel={onClose}
         open={showFailureModal} 
         centered width={442} 
+        maskClosable={false}
         footer={() => <Button type="primary" onClick={onClose} block>Close</Button>}>
         <Result
           status="error"

diff --git a/components/transactions/components/TransferVerification.tsx b/components/transactions/components/TransferVerification.tsx
@@ -97,6 +97,7 @@ const TransferVerification = ({
       closable
       onCancel={onCancel}
       title='Transaction Summary'
+      maskClosable={false}
       centered
       width={672}
       footer={() => (<Flex flex={1} gap={12}>

diff --git a/utils/index.ts b/utils/index.ts
@@ -23,4 +23,10 @@ export const formatNumber = (value: string) => {
 
 export const isEmptyObject = (obj: object) => {
   return Object.keys(obj).length === 0;
+}
+
+export const roundNumber = (num: string) => {
+  const trimmed = parseFloat(num).toString();
+  const formatted = trimmed.replace(/(\.\d*?[1-9])0+$/g, '$1');
+  return formatted;
 }