Add account address argument to voucher hooks

idea/frontend/src/features/voucher/ui/use-voucher-checkbox/use-voucher-checkbox.tsx

@@ -1,5 +1,5 @@
 import { HexString } from '@gear-js/api';
-import { useBalanceFormat, useVoucher } from '@gear-js/react-hooks';
+import { useAccountVoucher, useBalanceFormat } from '@gear-js/react-hooks';
 
 import { LabeledCheckbox } from '@/shared/ui';
 
@@ -10,7 +10,7 @@ type Props = {
 };
 
 const UseVoucherCheckbox = ({ programId }: Props) => {
-  const { isVoucherExists, voucherBalance } = useVoucher(programId);
+  const { isVoucherExists, voucherBalance } = useAccountVoucher(programId);
   const { getFormattedBalance } = useBalanceFormat();
 
   const formattedBalance = voucherBalance ? getFormattedBalance(voucherBalance) : undefined;

idea/frontend/src/features/voucher/ui/voucher-badge/voucher-badge.tsx

@@ -1,5 +1,5 @@
 import { HexString } from '@gear-js/api';
-import { useIsVoucherExists } from '@gear-js/react-hooks';
+import { useIsAccountVoucherExists } from '@gear-js/react-hooks';
 
 import { withAccount } from '@/shared/ui';
 
@@ -11,7 +11,7 @@ type Props = {
 };
 
 const VoucherBadge = withAccount(({ programId }: Props) => {
-  const { isVoucherExists } = useIsVoucherExists(programId);
+  const { isVoucherExists } = useIsAccountVoucherExists(programId);
 
   return isVoucherExists ? <BadgeSVG className={styles.badge} /> : null;
 });

idea/frontend/src/features/voucher/ui/voucher-table/voucher-table.tsx

@@ -1,5 +1,5 @@
 import { HexString } from '@gear-js/api';
-import { useBalanceFormat, useVoucher } from '@gear-js/react-hooks';
+import { useAccountVoucher, useBalanceFormat } from '@gear-js/react-hooks';
 
 import VoucherPlaceholderSVG from '@/features/voucher/assets/voucher-placeholder.svg?react';
 import { ContentLoader } from '@/shared/ui/contentLoader';
@@ -14,7 +14,7 @@ type Props = {
 };
 
 const VoucherTable = withAccount(({ programId }: Props) => {
-  const { isVoucherReady, isVoucherExists, voucherBalance } = useVoucher(programId);
+  const { isVoucherReady, isVoucherExists, voucherBalance } = useAccountVoucher(programId);
   const { getFormattedBalance } = useBalanceFormat();
 
   const status = isVoucherExists ? BulbStatus.Success : BulbStatus.Error;

utils/gear-hooks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gear-js/react-hooks",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "React hooks used across Gear applications",
   "author": "Gear Technologies",
   "license": "GPL-3.0",

utils/gear-hooks/src/hooks/api/index.ts

@@ -10,7 +10,15 @@ import {
   useReplyCalculateGas,
 } from './useCalculateGas';
 
-import { useIsVoucherExists, useVoucherBalance, useVoucher } from './voucher';
+import {
+  useIsVoucherExists,
+  useVoucherBalance,
+  useVoucher,
+  useIsAccountVoucherExists,
+  useAccountVoucherBalance,
+  useAccountVoucher,
+} from './voucher';
+
 import { useBalance, useBalanceFormat } from './balance';
 
 export {
@@ -26,6 +34,9 @@ export {
   useIsVoucherExists,
   useVoucherBalance,
   useVoucher,
+  useIsAccountVoucherExists,
+  useAccountVoucherBalance,
+  useAccountVoucher,
   useBalance,
   useBalanceFormat,
   SendMessageOptions,

utils/gear-hooks/src/hooks/api/voucher/index.ts

@@ -2,4 +2,15 @@ import { useIsVoucherExists } from './use-is-voucher-exists';
 import { useVoucherBalance } from './use-voucher-balance';
 import { useVoucher } from './use-voucher';
 
-export { useIsVoucherExists, useVoucherBalance, useVoucher };
+import { useIsAccountVoucherExists } from './use-is-account-voucher-exists';
+import { useAccountVoucherBalance } from './use-account-voucher-balance';
+import { useAccountVoucher } from './use-account-voucher';
+
+export {
+  useIsVoucherExists,
+  useVoucherBalance,
+  useVoucher,
+  useIsAccountVoucherExists,
+  useAccountVoucherBalance,
+  useAccountVoucher,
+};

utils/gear-hooks/src/hooks/api/voucher/use-account-voucher-balance.ts

@@ -0,0 +1,12 @@
+import { AccountContext } from 'context';
+import { useContext } from 'react';
+import { useVoucherBalance } from './use-voucher-balance';
+import { HexString } from '@gear-js/api';
+
+function useAccountVoucherBalance(programId: HexString | undefined) {
+  const { account } = useContext(AccountContext);
+
+  return useVoucherBalance(programId, account?.decodedAddress);
+}
+
+export { useAccountVoucherBalance };

utils/gear-hooks/src/hooks/api/voucher/use-account-voucher.ts

@@ -0,0 +1,12 @@
+import { useContext } from 'react';
+import { useVoucher } from './use-voucher';
+import { AccountContext } from 'context';
+import { HexString } from '@gear-js/api';
+
+function useAccountVoucher(programId: HexString | undefined) {
+  const { account } = useContext(AccountContext);
+
+  return useVoucher(programId, account?.decodedAddress);
+}
+
+export { useAccountVoucher };

utils/gear-hooks/src/hooks/api/voucher/use-is-account-voucher-exists.ts

@@ -0,0 +1,12 @@
+import { HexString } from '@gear-js/api';
+import { useIsVoucherExists } from './use-is-voucher-exists';
+import { useContext } from 'react';
+import { AccountContext } from 'context';
+
+function useIsAccountVoucherExists(programId: HexString | undefined) {
+  const { account } = useContext(AccountContext);
+
+  return useIsVoucherExists(programId, account?.decodedAddress);
+}
+
+export { useIsAccountVoucherExists };

utils/gear-hooks/src/hooks/api/voucher/use-is-voucher-exists.ts

@@ -1,14 +1,11 @@
 import { HexString } from '@gear-js/api';
-import { AccountContext, AlertContext, ApiContext } from 'context';
+import { AlertContext, ApiContext } from 'context';
 import { useState, useEffect, useContext } from 'react';
 
-function useIsVoucherExists(programId: HexString | undefined) {
+function useIsVoucherExists(programId: HexString | undefined, accountAddress: HexString | undefined) {
   const { api, isApiReady } = useContext(ApiContext); // сircular dependency fix
   const alert = useContext(AlertContext);
 
-  const { account } = useContext(AccountContext);
-  const accountAddress = account?.decodedAddress;
-
   const [isVoucherExists, setIsVoucherExists] = useState<boolean>();
   const isVoucherExistsReady = isVoucherExists !== undefined;
 

utils/gear-hooks/src/hooks/api/voucher/use-voucher-balance.ts

@@ -1,12 +1,8 @@
 import { HexString, generateVoucherId } from '@gear-js/api';
-import { AccountContext } from 'context';
-import { useContext } from 'react';
-import { useBalance } from '../balance/use-balance';
 
-function useVoucherBalance(programId: HexString | undefined) {
-  const { account } = useContext(AccountContext);
-  const accountAddress = account?.decodedAddress;
+import { useBalance } from '../balance/use-balance';
 
+function useVoucherBalance(programId: HexString | undefined, accountAddress: HexString | undefined) {
   const { balance, isBalanceReady } = useBalance(
     programId && accountAddress ? generateVoucherId(accountAddress, programId) : undefined,
   );

utils/gear-hooks/src/hooks/api/voucher/use-voucher.ts

@@ -3,9 +3,9 @@ import { HexString } from '@polkadot/util/types';
 import { useIsVoucherExists } from './use-is-voucher-exists';
 import { useVoucherBalance } from './use-voucher-balance';
 
-function useVoucher(programId: HexString | undefined) {
-  const { isVoucherExists, isVoucherExistsReady } = useIsVoucherExists(programId);
-  const { voucherBalance, isVoucherBalanceReady } = useVoucherBalance(programId);
+function useVoucher(programId: HexString | undefined, accountAddress: HexString | undefined) {
+  const { isVoucherExists, isVoucherExistsReady } = useIsVoucherExists(programId, accountAddress);
+  const { voucherBalance, isVoucherBalanceReady } = useVoucherBalance(programId, accountAddress);
 
   const isVoucherReady = isVoucherExistsReady && isVoucherBalanceReady;
 

utils/gear-hooks/src/hooks/index.ts

@@ -11,6 +11,9 @@ import {
   useIsVoucherExists,
   useVoucherBalance,
   useVoucher,
+  useIsAccountVoucherExists,
+  useAccountVoucherBalance,
+  useAccountVoucher,
   useBalance,
   useBalanceFormat,
   SendMessageOptions,
@@ -32,6 +35,9 @@ export {
   useIsVoucherExists,
   useVoucherBalance,
   useVoucher,
+  useIsAccountVoucherExists,
+  useAccountVoucherBalance,
+  useAccountVoucher,
   useBalance,
   useBalanceFormat,
   useAccount,

utils/gear-hooks/src/index.ts

@@ -11,6 +11,9 @@ import {
   useIsVoucherExists,
   useVoucherBalance,
   useVoucher,
+  useIsAccountVoucherExists,
+  useAccountVoucherBalance,
+  useAccountVoucher,
   useBalance,
   useBalanceFormat,
   useAccount,
@@ -60,6 +63,9 @@ export {
   useIsVoucherExists,
   useVoucherBalance,
   useVoucher,
+  useIsAccountVoucherExists,
+  useAccountVoucherBalance,
+  useAccountVoucher,
   useBalance,
   useBalanceFormat,
   useAccount,