fix the permissions for forced transfer

kadena-community · Jan 8, 2025 · 5ff737d · 5ff737d
1 parent 0830d3c
commit 5ff737d
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 12 deletions.
diff --git a/packages/apps/rwa-demo/src/components/TransferForm/TransferForm.tsx b/packages/apps/rwa-demo/src/components/TransferForm/TransferForm.tsx
@@ -1,4 +1,5 @@
 import { useAccount } from '@/hooks/account';
+import { useForcedTransferTokens } from '@/hooks/forcedTransferTokens';
 import { useGetFrozenTokens } from '@/hooks/getFrozenTokens';
 import { useGetInvestorBalance } from '@/hooks/getInvestorBalance';
 import { useGetInvestors } from '@/hooks/getInvestors';
@@ -43,9 +44,11 @@ export const TransferForm: FC<IProps> = ({
   const { account } = useAccount();
   const { data: balance } = useGetInvestorBalance({ investorAccount });
   const { data: investors } = useGetInvestors();
+  const { submit: forcedSubmit, isAllowed: isForcedAllowed } =
+    useForcedTransferTokens();
   const { submit, isAllowed } = useTransferTokens();
   const { data: frozenAmount } = useGetFrozenTokens({
-    investorAccount: investorAccount,
+    investorAccount,
   });
 
   const {
@@ -56,7 +59,7 @@ export const TransferForm: FC<IProps> = ({
   } = useForm<ITransferTokensProps>({
     values: {
       amount: 0,
-      investorFromAccount: account?.address!,
+      investorFromAccount: investorAccount,
       investorToAccount: '',
       isForced,
     },
@@ -75,16 +78,19 @@ export const TransferForm: FC<IProps> = ({
   };
 
   const onSubmit = async (data: ITransferTokensProps) => {
-    await submit(data);
+    if (data.isForced) {
+      await forcedSubmit(data);
+    } else {
+      await submit(data);
+    }
     handleOnClose();
   };
 
   const filteredInvestors = investors.filter(
-    (i) => i.accountName !== account?.address,
+    (i) => i.accountName !== investorAccount,
   );
 
   if (!account) return;
-
   const maxAmount = isForced ? balance : balance - frozenAmount;
 
   return (
@@ -156,7 +162,12 @@ export const TransferForm: FC<IProps> = ({
               <Button onPress={handleOnClose} variant="transparent">
                 Cancel
               </Button>
-              <Button isDisabled={!isAllowed || !isValid} type="submit">
+              <Button
+                isDisabled={
+                  (isForced ? !isForcedAllowed : !isAllowed) || !isValid
+                }
+                type="submit"
+              >
                 Transfer
               </Button>
             </RightAsideFooter>

diff --git a/packages/apps/rwa-demo/src/hooks/forcedTransferTokens.ts b/packages/apps/rwa-demo/src/hooks/forcedTransferTokens.ts
@@ -0,0 +1,50 @@
+import {
+  interpretErrorMessage,
+  TXTYPES,
+} from '@/components/TransactionsProvider/TransactionsProvider';
+import { forcedTransferTokens } from '@/services/forcedTransferTokens';
+import type { ITransferTokensProps } from '@/services/transferTokens';
+import { getClient } from '@/utils/client';
+import { useNotifications } from '@kadena/kode-ui/patterns';
+import { useEffect, useState } from 'react';
+import { useAccount } from './account';
+import { useAsset } from './asset';
+import { useTransactions } from './transactions';
+
+export const useForcedTransferTokens = () => {
+  const { account, sign, isMounted, accountRoles } = useAccount();
+  const { paused } = useAsset();
+  const { addTransaction } = useTransactions();
+  const { addNotification } = useNotifications();
+  const [isAllowed, setIsAllowed] = useState(false);
+
+  const submit = async (data: ITransferTokensProps) => {
+    try {
+      const tx = await forcedTransferTokens(data, account!);
+      const signedTransaction = await sign(tx);
+      if (!signedTransaction) return;
+
+      const client = getClient();
+      const res = await client.submit(signedTransaction);
+
+      return addTransaction({
+        ...res,
+        type: TXTYPES.TRANSFERTOKENS,
+        accounts: [data.investorFromAccount, data.investorToAccount],
+      });
+    } catch (e: any) {
+      addNotification({
+        intent: 'negative',
+        label: 'there was an error',
+        message: interpretErrorMessage(e.message),
+      });
+    }
+  };
+
+  useEffect(() => {
+    if (!isMounted) return;
+    setIsAllowed(!paused && accountRoles.isTransferManager());
+  }, [paused, isMounted, accountRoles]);
+
+  return { submit, isAllowed };
+};
diff --git a/packages/apps/rwa-demo/src/hooks/transferTokens.ts b/packages/apps/rwa-demo/src/hooks/transferTokens.ts
@@ -2,7 +2,6 @@ import {
   interpretErrorMessage,
   TXTYPES,
 } from '@/components/TransactionsProvider/TransactionsProvider';
-import { forcedTransferTokens } from '@/services/forcedTransferTokens';
 import type { ITransferTokensProps } from '@/services/transferTokens';
 import { transferTokens } from '@/services/transferTokens';
 import { getClient } from '@/utils/client';
@@ -23,9 +22,7 @@ export const useTransferTokens = () => {
 
   const submit = async (data: ITransferTokensProps) => {
     try {
-      const tx = data.isForced
-        ? await forcedTransferTokens(data, account!)
-        : await transferTokens(data, account!);
+      const tx = await transferTokens(data, account!);
       const signedTransaction = await sign(tx);
       if (!signedTransaction) return;
 

diff --git a/packages/apps/rwa-demo/src/services/forcedTransferTokens.ts b/packages/apps/rwa-demo/src/services/forcedTransferTokens.ts
@@ -26,8 +26,7 @@ export const forcedTransferTokens = async (
       senderAccount: account.address,
       chainId: getNetwork().chainId,
     })
-    .addSigner(createPubKeyFromAccount(data.investorFromAccount), (withCap) => [
-      withCap(`${getAsset()}.FORCED-TRANSFER`),
+    .addSigner(createPubKeyFromAccount(account.address), (withCap) => [
       withCap(`${getAsset()}.ONLY-AGENT`, 'transfer-manager'),
       withCap(
         `${getAsset()}.TRANSFER`,