Add Asset hubs reserved amount to extension mode

Eliminate // @ts-nocheck Apply code rabit suggestions
PolkaGate · Jul 1, 2024 · 230133e · 230133e
1 parent d206c68
commit 230133e
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 35 deletions.
diff --git a/packages/extension-polkagate/src/components/Assets.tsx b/packages/extension-polkagate/src/components/Assets.tsx
@@ -1,6 +1,5 @@
 // Copyright 2019-2024 @polkadot/extension-polkagate authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-// @ts-nocheck
 
 /* eslint-disable react/jsx-max-props-per-line */
 

diff --git a/...s/extension-polkagate/src/fullscreen/accountDetails/components/ReservedDisplayBalance.tsx b/...s/extension-polkagate/src/fullscreen/accountDetails/components/ReservedDisplayBalance.tsx
@@ -68,26 +68,24 @@ const ReservedDetails = ({ reservedDetails, showReservedDetails }: ReservedDetai
 
   const reasonsToShow = useMemo(() => {
     const details = Object.values(reservedDetails);
+
     if (details.length === 0) {
       return undefined
-    } else {
-
-      const noReason = details.every((deposit) => deposit === null);
+    }
 
-      if (noReason) {
-        return null;
-      } else {
-        const filteredReservedDetails = Object.fromEntries(
-          Object.entries(reservedDetails).filter(([_key, value]) => value && !value.isZero())
-        );
+    const noReason = details.every((deposit) => deposit === null);
 
-        if (Object.values(filteredReservedDetails).length > 0) {
-          return filteredReservedDetails;
-        } else {
-          return undefined;
-        }
-      }
+    if (noReason) {
+      return null;
     }
+
+    const filteredReservedDetails = Object.fromEntries(
+      Object.entries(reservedDetails).filter(([_key, value]) => value && !value.isZero())
+    );
+
+    return Object.values(filteredReservedDetails).length > 0
+      ? filteredReservedDetails
+      : undefined
   }, [reservedDetails]);
 
   return (
@@ -131,11 +129,7 @@ export default function ReservedDisplayBalance({ address, amount, disabled, pric
   const notOnNativeAsset = useMemo(() => {
     const assetIdNumber = Number(paramAssetId);
 
-    if (isNaN(assetIdNumber) || assetIdNumber > 0) {
-      return true;
-    } else {
-      return false;
-    }
+    return Number.isNaN(assetIdNumber) || assetIdNumber > 0;
   }, [paramAssetId]);
 
   const [showReservedDetails, setShowReservedDetails] = useState<boolean>(false);

diff --git a/packages/extension-polkagate/src/popup/account/LabelBalancePrice.tsx b/packages/extension-polkagate/src/popup/account/LabelBalancePrice.tsx
@@ -1,6 +1,6 @@
 // Copyright 2019-2024 @polkadot/extension-polkagate authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-// @ts-nocheck
+
 /* eslint-disable header/header */
 /* eslint-disable react/jsx-max-props-per-line */
 

diff --git a/packages/extension-polkagate/src/popup/account/ReservedReasons.tsx b/packages/extension-polkagate/src/popup/account/ReservedReasons.tsx
@@ -1,6 +1,5 @@
 // Copyright 2019-2024 @polkadot/extension-polkagate authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-// @ts-nocheck
 
 /* eslint-disable react/jsx-max-props-per-line */
 
@@ -12,7 +11,7 @@
 import type { DeriveAccountRegistration } from '@polkadot/api-derive/types';
 
 import { Container, Divider, Grid, Typography } from '@mui/material';
-import React, { useCallback } from 'react';
+import React, { useCallback, useMemo } from 'react';
 
 import { toTitleCase } from '@polkadot/extension-polkagate/src/fullscreen/governance/utils/util';
 import type { AccountId } from '@polkadot/types/interfaces/runtime';
@@ -55,6 +54,28 @@ export default function ReservedReasons({ address, assetId, identity, setShow, s
     setShow(false);
   }, [setShow]);
 
+  const reasonsToShow = useMemo(() => {
+    const details = Object.values(reservedDetails);
+
+    if (details.length === 0) {
+      return undefined
+    }
+
+    const noReason = details.every((deposit) => deposit === null);
+
+    if (noReason) {
+      return null;
+    }
+
+    const filteredReservedDetails = Object.fromEntries(
+      Object.entries(reservedDetails).filter(([_key, value]) => value && !value.isZero())
+    );
+
+    return Object.values(filteredReservedDetails).length > 0
+      ? filteredReservedDetails
+      : undefined
+  }, [reservedDetails]);
+
   return (
     <Motion>
       <Popup show={show}>
@@ -81,9 +102,9 @@ export default function ReservedReasons({ address, assetId, identity, setShow, s
           </Grid>
         </Container>
         <Container disableGutters sx={{ maxHeight: `${parent.innerHeight - 150}px`, overflowY: 'auto', px: '15px' }}>
-          {Object.entries(reservedDetails)?.length
+          {reasonsToShow
             ? <>
-              {Object.entries(reservedDetails)?.map(([key, value], index) => (
+              {Object.entries(reasonsToShow)?.map(([key, value], index) => (
                 <Grid container item key={index}>
                   <Grid alignItems='center' container justifyContent='space-between' py='5px'>
                     <Grid item sx={{ fontSize: '16px', fontWeight: 300, lineHeight: '36px' }} xs={6}>
@@ -109,13 +130,17 @@ export default function ReservedReasons({ address, assetId, identity, setShow, s
                 </Grid>
               ))}
             </>
-            : <Progress
-              fontSize={14}
-              pt={10}
-              size={100}
-              title={t('Loading information, please wait ...')}
-              type='grid'
-            />
+            : reasonsToShow === null
+              ? <Typography fontSize='16px' fontWeight={500} width='100%'>
+                {t('No reasons found!')}
+              </Typography>
+              : <Progress
+                fontSize={14}
+                pt={10}
+                size={100}
+                title={t('Loading information, please wait ...')}
+                type='grid'
+              />
           }
         </Container>
       </Popup>

diff --git a/packages/extension-polkagate/src/popup/account/index.tsx b/packages/extension-polkagate/src/popup/account/index.tsx
@@ -1,6 +1,6 @@
 // Copyright 2019-2024 @polkadot/extension-polkagate authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-// @ts-nocheck
+
 /* eslint-disable header/header */
 /* eslint-disable react/jsx-max-props-per-line */
 
@@ -52,7 +52,12 @@ export default function AccountDetails(): React.ReactElement {
   const [showReservedReasons, setShowReservedReasons] = useState<boolean | undefined>(false);
   const [showStakingOptions, setShowStakingOptions] = useState<boolean>(false);
 
-  const showReservedChevron = useMemo(() => balances && !balances?.reservedBalance.isZero() && isOnRelayChain(genesisHash), [balances, genesisHash]);
+  const notOnNativeAsset = useMemo(() => {
+    const assetIdNumber = Number(assetId);
+
+    return assetIdNumber > 0;
+  }, [assetId]);
+  const showReservedChevron = useMemo(() => balances && !balances?.reservedBalance.isZero() && (isOnRelayChain(genesisHash) || !notOnNativeAsset), [balances, genesisHash, notOnNativeAsset]);
 
   const gotToHome = useCallback(() => {
     if (showStakingOptions) {