fix the login and faucet when no asset has been created yet (#2796)

Author: sstraatemans

packages/apps/rwa-demo/src/app/(loggedout)/assets/create/page.tsx

@@ -11,7 +11,6 @@ const Home = () => {
   const router = useRouter();
 
   useEffect(() => {
-    console.log(66666, { isMounted, account });
     if (isMounted && !account) {
       router.replace('/login');
       return;

packages/apps/rwa-demo/src/app/(loggedout)/layout.tsx

@@ -1,5 +1,6 @@
 'use client';
 
+import { GasPayableBanner } from '@/components/GasPayableBanner/GasPayableBanner';
 import { Card, Stack, Text } from '@kadena/kode-ui';
 import React from 'react';
 import {
@@ -23,7 +24,10 @@ const RootLayout = ({
       className={wrapperClass}
     >
       <Stack flexDirection="column" className={cardWrapperClass}>
-        <Card className={cardClass}>{children}</Card>
+        <Card className={cardClass}>
+          <GasPayableBanner />
+          {children}
+        </Card>
         <Stack
           className={footerClass}
           width="100%"

packages/apps/rwa-demo/src/components/AccountProvider/AccountProvider.tsx

@@ -165,7 +165,8 @@ export const AccountProvider: FC<PropsWithChildren> = ({ children }) => {
 
   useEffect(() => {
     const storage = localStorage.getItem(getAccountCookieName());
-    if (storage) {
+
+    if (storage && storage !== 'undefined') {
       console.log({ account: JSON.parse(storage) });
       try {
         setAccount(JSON.parse(storage));

packages/apps/rwa-demo/src/hooks/__tests__/faucet.test.ts

@@ -10,9 +10,6 @@ describe('faucet hook', () => {
         },
         sign: vi.fn(),
         isMounted: true,
-        isAgent: true,
-        isOwner: true,
-        isInvestor: true,
         isGasPayable: true,
       }),
       useNetwork: vi.fn().mockReturnValue({
@@ -76,15 +73,12 @@ describe('faucet hook', () => {
   });
 
   describe('isAllowed', () => {
-    it('should return true, when account is mounted, when it is owner, when gas is NOT payable, when network is development', () => {
+    it('should return true, when account is mounted, when gas is NOT payable, when network is development', () => {
       mocksHook.useAccount.mockImplementation(() => ({
         account: {
           address: 'k:he-man',
         },
         isMounted: true,
-        isAgent: false,
-        isOwner: true,
-        isInvestor: false,
         isGasPayable: false,
       }));
 
@@ -99,15 +93,12 @@ describe('faucet hook', () => {
     });
   });
 
-  it('should return false, when account is NOT mounted, when it is owner, when gas is NOT payable, when network is development', () => {
+  it('should return false, when account is NOT mounted, when gas is NOT payable, when network is development', () => {
     mocksHook.useAccount.mockImplementation(() => ({
       account: {
         address: 'k:he-man',
       },
       isMounted: false,
-      isAgent: false,
-      isOwner: true,
-      isInvestor: false,
       isGasPayable: false,
     }));
 
@@ -121,37 +112,12 @@ describe('faucet hook', () => {
     expect(result.current.isAllowed).toBe(false);
   });
 
-  it('should return false, when account is mounted, when account has no role, when gas is NOT payable, when network is development', () => {
+  it('should return false, when account is mounted, when gas is payable, when network is development', () => {
     mocksHook.useAccount.mockImplementation(() => ({
       account: {
         address: 'k:he-man',
       },
       isMounted: true,
-      isAgent: false,
-      isOwner: false,
-      isInvestor: false,
-      isGasPayable: false,
-    }));
-
-    mocksHook.useNetwork.mockImplementation(() => ({
-      ...mocksHook.useNetwork.getMockImplementation(),
-      activeNetwork: { networkId: 'development' },
-    }));
-
-    const { result } = renderHook(() => useFaucet());
-
-    expect(result.current.isAllowed).toBe(false);
-  });
-
-  it('should return false, when account is mounted, when account isinvestor, when gas is payable, when network is development', () => {
-    mocksHook.useAccount.mockImplementation(() => ({
-      account: {
-        address: 'k:he-man',
-      },
-      isMounted: true,
-      isAgent: false,
-      isOwner: false,
-      isInvestor: true,
       isGasPayable: true,
     }));
 
@@ -165,15 +131,12 @@ describe('faucet hook', () => {
     expect(result.current.isAllowed).toBe(false);
   });
 
-  it('should return false, when account is mounted, when account isagent, when gas is NOT payable, when network is mainnet', () => {
+  it('should return false, when account is mounted, when gas is NOT payable, when network is mainnet', () => {
     mocksHook.useAccount.mockImplementation(() => ({
       account: {
         address: 'k:he-man',
       },
       isMounted: false,
-      isAgent: true,
-      isOwner: false,
-      isInvestor: true,
       isGasPayable: false,
     }));
 

packages/apps/rwa-demo/src/hooks/addInvestor.ts

@@ -21,7 +21,7 @@ export const useAddInvestor = ({
 }) => {
   const { frozen } = useFreeze({ investorAccount });
   const { paused } = useAsset();
-  const { account, sign, accountRoles, isMounted } = useAccount();
+  const { account, isOwner, sign, accountRoles, isMounted } = useAccount();
   const { addTransaction, isActiveAccountChangeTx } = useTransactions();
   const { addNotification } = useNotifications();
   const [isAllowed, setIsAllowed] = useState(false);
@@ -63,14 +63,15 @@ export const useAddInvestor = ({
     setIsAllowed(
       ((!!investorAccount && !frozen) || frozen) &&
         !paused &&
-        accountRoles.isAgentAdmin() &&
+        (accountRoles.isAgentAdmin() || isOwner) &&
         !isActiveAccountChangeTx,
     );
   }, [
     frozen,
     paused,
     isMounted,
     investorAccount,
+    isOwner,
     accountRoles,
     isActiveAccountChangeTx,
   ]);

packages/apps/rwa-demo/src/hooks/batchAddInvestors.ts

@@ -15,7 +15,7 @@ import { useTransactions } from './transactions';
 
 export const useBatchAddInvestors = () => {
   const { paused } = useAsset();
-  const { account, sign, accountRoles, isMounted } = useAccount();
+  const { account, isOwner, sign, accountRoles, isMounted } = useAccount();
   const { addTransaction, isActiveAccountChangeTx } = useTransactions();
   const { addNotification } = useNotifications();
   const [isAllowed, setIsAllowed] = useState(false);
@@ -57,9 +57,11 @@ export const useBatchAddInvestors = () => {
     if (!isMounted) return;
 
     setIsAllowed(
-      !paused && accountRoles.isAgentAdmin() && !isActiveAccountChangeTx,
+      !paused &&
+        (accountRoles.isAgentAdmin() || isOwner) &&
+        !isActiveAccountChangeTx,
     );
-  }, [paused, isMounted, accountRoles, isActiveAccountChangeTx]);
+  }, [paused, isOwner, isMounted, accountRoles, isActiveAccountChangeTx]);
 
   return { submit, isAllowed };
 };

packages/apps/rwa-demo/src/hooks/deleteInvestor.ts

@@ -19,7 +19,7 @@ export const useDeleteInvestor = ({
   investorAccount?: string;
 }) => {
   useGetInvestorBalance;
-  const { account, sign, accountRoles, isMounted } = useAccount();
+  const { account, isOwner, sign, accountRoles, isMounted } = useAccount();
   const { data: balance } = useGetInvestorBalance({ investorAccount });
   const { paused } = useAsset();
   const { addTransaction, isActiveAccountChangeTx } = useTransactions();
@@ -75,9 +75,18 @@ export const useDeleteInvestor = ({
     }
 
     setIsAllowed(
-      !paused && accountRoles.isAgentAdmin() && !isActiveAccountChangeTx,
+      !paused &&
+        (accountRoles.isAgentAdmin() || isOwner) &&
+        !isActiveAccountChangeTx,
     );
-  }, [paused, account?.address, isMounted, balance, isActiveAccountChangeTx]);
+  }, [
+    paused,
+    isOwner,
+    account?.address,
+    isMounted,
+    balance,
+    isActiveAccountChangeTx,
+  ]);
 
   return { submit, isAllowed, notAllowedReason };
 };

packages/apps/rwa-demo/src/hooks/faucet.ts

@@ -12,15 +12,7 @@ import { useNetwork } from './networks';
 import { useTransactions } from './transactions';
 
 export const useFaucet = () => {
-  const {
-    account,
-    sign,
-    isMounted,
-    isAgent,
-    isOwner,
-    isInvestor,
-    isGasPayable,
-  } = useAccount();
+  const { account, sign, isMounted, isGasPayable } = useAccount();
   const { addTransaction } = useTransactions();
   const { activeNetwork } = useNetwork();
   const { addNotification } = useNotifications();
@@ -54,8 +46,8 @@ export const useFaucet = () => {
   useEffect(() => {
     if (!isMounted || activeNetwork.networkId !== 'development') return;
 
-    setIsAllowed((isAgent || isOwner || isInvestor) && !isGasPayable);
-  }, [isOwner, isInvestor, isAgent, isMounted, isOwner, isGasPayable]);
+    setIsAllowed(!!account?.address && !isGasPayable);
+  }, [account?.address, isMounted, isGasPayable]);
 
   return { submit, isAllowed };
 };

packages/apps/rwa-demo/src/hooks/setCompliance.ts

@@ -15,7 +15,7 @@ import { useAsset } from './asset';
 import { useTransactions } from './transactions';
 
 export const useSetCompliance = () => {
-  const { account, sign, isMounted, accountRoles } = useAccount();
+  const { account, isOwner, sign, isMounted, accountRoles } = useAccount();
   const { asset, paused } = useAsset();
   const { addTransaction, isActiveAccountChangeTx } = useTransactions();
   const { addNotification } = useNotifications();
@@ -78,13 +78,16 @@ export const useSetCompliance = () => {
   useEffect(() => {
     if (!isMounted) return;
     setIsAllowed(
-      !paused && accountRoles.isAgentAdmin() && !isActiveAccountChangeTx,
+      !paused &&
+        (accountRoles.isAgentAdmin() || isOwner) &&
+        !isActiveAccountChangeTx,
     );
   }, [
     paused,
     account?.address,
     isMounted,
     accountRoles,
+    isOwner,
     isActiveAccountChangeTx,
   ]);