chore: 🤖 resolve review-comments

Author: prashantasdeveloper

.github/workflows/auth-ff-merge.yml

@@ -19,7 +19,7 @@ jobs:
       issues: write
     steps:
       - name: Polymesh Action - Auth and Fast-Forward
-        uses: PolymeshAssociation/polymesh-action-public@v2.0.1
+        uses: PolymeshAssociation/polymesh-action-public@v2.0.2
         with:
           allowed-signers: ${{ vars.MIDDLEWARE_ALLOWED_SIGNERS }}
           github-token: ${{ secrets.GITHUB_TOKEN }}

src/layouts/Portfolio/components/NftAssetTable/components/TickerCell/index.tsx

@@ -24,7 +24,7 @@ export const TickerCell: React.FC<ITickerCellProps> = ({ info }) => {
         )}
       </StyledImageWrap>
       {name}
-      {ticker ? ` (${ticker})` : '-'}
+      {ticker ? ` (${ticker})` : ''}
     </StyledCell>
   );
 };

src/layouts/Portfolio/components/NftView/components/NftAsset/hooks.tsx

@@ -44,6 +44,7 @@ export const useNftAsset = () => {
         buildBalanceSearchParams({
           holder: selectedHolder,
           portfolioId: selectedPortfolioId,
+          accountAddress: selectedAccountAddress,
           additionalParams: {
             nftCollection,
           },
@@ -86,6 +87,7 @@ export const useNftAsset = () => {
           buildBalanceSearchParams({
             holder: selectedHolder,
             portfolioId: selectedPortfolioId,
+            accountAddress: selectedAccountAddress,
           }),
         );
       } finally {

src/layouts/Portfolio/components/NftView/components/NftAsset/index.tsx

@@ -44,20 +44,21 @@ export const NftAsset = () => {
     const did = nft.ownerDid;
     const portfolioId = nft.ownerPortfolioId;
 
-    try {
-      (async () => {
+    (async () => {
+      try {
         const name = await polkadotApi.query.portfolio.portfolios(
           did,
           portfolioId,
         );
         if (name.isNone) {
           setPortfolioName('');
+          return;
         }
         setPortfolioName(`${portfolioId} / ${bytesToString(name.unwrap())}`);
-      })();
-    } catch (error) {
-      setPortfolioName('');
-    }
+      } catch {
+        setPortfolioName('');
+      }
+    })();
   }, [nftLoading, nft?.ownerPortfolioId, nft?.ownerDid, polkadotApi]);
 
   if (nftLoading) {

src/layouts/Staking/components/StakingAccountInfo/components/ModalForm/hooks.tsx

@@ -17,6 +17,12 @@ export const useModalForm = (modalType: EModalOptions | null, max?: number) => {
     api: { sdk },
   } = useContext(PolymeshContext);
 
+  const sdkRef = useRef(sdk);
+  sdkRef.current = sdk;
+
+  const maxRef = useRef(max);
+  maxRef.current = max;
+
   // Lazily build and cache the form config on the first render only.
   const formConfigRef = useRef<{
     mode: keyof ValidationMode;
@@ -26,9 +32,10 @@ export const useModalForm = (modalType: EModalOptions | null, max?: number) => {
 
   if (formConfigRef.current === null && modalType) {
     const isValidAddress = (address: string) => {
-      if (!sdk) return false;
+      const currentSdk = sdkRef.current;
+      if (!currentSdk) return false;
       try {
-        return sdk.accountManagement.isValidAddress({ address });
+        return currentSdk.accountManagement.isValidAddress({ address });
       } catch {
         return false;
       }
@@ -45,7 +52,10 @@ export const useModalForm = (modalType: EModalOptions | null, max?: number) => {
         (value) =>
           value ? /^-?\d+(\.\d{1,6})?$/.test(value.toString()) : true,
       )
-      .max(Number(max), 'Insufficient balance')
+      .test('max-balance', 'Insufficient balance', (value) => {
+        if (value == null || maxRef.current == null) return true;
+        return value <= maxRef.current;
+      })
       .test('is-zero', 'Amount must be greater than 0', (value) => value !== 0);
 
     const specifiedAccountValidation = yup

src/layouts/Transfers/components/TransferItem/components/InstructionLeg/index.tsx

@@ -75,6 +75,35 @@ export const InstructionLeg: React.FC<ILegProps> = ({
 
   const isSmallScreen = isMobile || isTablet;
 
+  const isSelectedSendingParticipant =
+    legDetails?.sendingDid === identity?.did ||
+    legDetails?.sendingAddress === selectedAccount;
+
+  const isSelectedReceivingParticipant =
+    legDetails?.receivingDid === identity?.did ||
+    legDetails?.receivingAddress === selectedAccount;
+
+  const getSendingParticipantLabel = () => {
+    if (!legDetails) return '';
+    if (isSelectedSendingParticipant) return 'Selected participant';
+    if (legDetails.sendingDid) return formatDid(legDetails.sendingDid);
+    if (legDetails.sendingAddress) {
+      return (
+        allAccountsWithMeta.find((a) => a.address === legDetails.sendingAddress)
+          ?.meta.name ?? formatDid(legDetails.sendingAddress)
+      );
+    }
+    return 'No identity';
+  };
+
+  const getReceivingParticipantLabel = () => {
+    if (!legDetails) return '';
+    if (isSelectedReceivingParticipant) return 'Selected participant';
+    return formatDid(
+      legDetails.receivingDid || legDetails.receivingAddress || '',
+    );
+  };
+
   const toggleModal = () => {
     setAssetDetailsModalOpen(false);
   };
@@ -196,9 +225,7 @@ export const InstructionLeg: React.FC<ILegProps> = ({
             )}
           >
             <Text size="large" bold>
-              {legDetails.sendingDid === identity?.did
-                ? 'Selected participant'
-                : formatDid(legDetails.sendingDid)}
+              {getSendingParticipantLabel()}
             </Text>
             <CopyToClipboard
               value={legDetails.sendingDid || legDetails.sendingAddress || ''}
@@ -231,11 +258,7 @@ export const InstructionLeg: React.FC<ILegProps> = ({
             )}
           >
             <Text size="large" bold>
-              {legDetails.receivingDid === identity?.did
-                ? 'Selected participant'
-                : formatDid(
-                    legDetails.receivingDid || legDetails.receivingAddress,
-                  )}
+              {getReceivingParticipantLabel()}
             </Text>
             <CopyToClipboard
               value={

src/layouts/Transfers/components/TransfersHeader/components/SendAsset/components/BasicForm/index.tsx

@@ -50,14 +50,18 @@ export const BasicForm: React.FC<IBasicFormProps> = ({ toggleModal }) => {
     api: { sdk },
   } = useContext(PolymeshContext);
 
+  const sdkRef = useRef(sdk);
+  sdkRef.current = sdk;
+
   const formConfigRef = useRef<ReturnType<typeof createBasicFormConfig> | null>(
     null,
   );
   if (formConfigRef.current === null) {
     formConfigRef.current = createBasicFormConfig((address) => {
-      if (!sdk) return false;
+      const currentSdk = sdkRef.current;
+      if (!currentSdk) return false;
       try {
-        return sdk.accountManagement.isValidAddress({ address });
+        return currentSdk.accountManagement.isValidAddress({ address });
       } catch {
         return false;
       }
@@ -328,7 +332,7 @@ export const BasicForm: React.FC<IBasicFormProps> = ({ toggleModal }) => {
               ...allPortfolios.map(({ id, name }) =>
                 id === 'default' ? 'Default Portfolio' : `${id} / ${name}`,
               ),
-              ...(hasAccountAssets ? ['Selected Account'] : []),
+              ...(hasAccountAssets ? ['Account'] : []),
             ]}
             error={undefined}
             enableSearch