Merge branch 'develop' into dev-tools/test-data-alias-ownership

apps/core/src/constants/coins.constants.ts

@@ -0,0 +1,5 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+export const COINS_QUERY_REFETCH_INTERVAL = 20_000;
+export const COINS_QUERY_STALE_TIME = 20_000;

apps/core/src/constants/index.ts

@@ -2,3 +2,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export * from './staking.constants';
+export * from './recognizedPackages.constants';
+export * from './coins.constants';

apps/core/src/constants/recognizedPackages.constants.ts

@@ -0,0 +1,6 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { IOTA_FRAMEWORK_ADDRESS, IOTA_SYSTEM_ADDRESS } from '@iota/iota.js/utils';
+
+export const DEFAULT_RECOGNIZED_PACKAGES = [IOTA_FRAMEWORK_ADDRESS, IOTA_SYSTEM_ADDRESS];

apps/core/src/hooks/index.ts

@@ -31,6 +31,7 @@ export * from './useKioskClient';
 export * from './useQueryTransactionsByAddress';
 export * from './useGetTransaction';
 export * from './useExtendedTransactionSummary';
+export * from './useSortedCoinsByCategories';
 export * from './useGetNFTMeta';
 export * from './useIotaAddressValidation';
 

apps/wallet/src/ui/app/hooks/useSortedCoinsByCategories.ts → apps/core/src/hooks/useSortedCoinsByCategories.ts

@@ -2,13 +2,12 @@
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { usePinnedCoinTypes } from '_app/hooks/usePinnedCoinTypes';
-import { useRecognizedPackages } from '_app/hooks/useRecognizedPackages';
-import { type CoinBalance as CoinBalanceType } from '@iota/iota.js/client';
+import { type CoinBalance } from '@iota/iota.js/client';
 import { IOTA_TYPE_ARG } from '@iota/iota.js/utils';
 import { useMemo } from 'react';
+import { DEFAULT_RECOGNIZED_PACKAGES } from '../constants';
 
-function sortCoins(balances: CoinBalanceType[]) {
+function sortCoins(balances: CoinBalance[]) {
     return balances.sort((a, b) => {
         if (a.coinType === IOTA_TYPE_ARG) {
             return -1;
@@ -18,26 +17,30 @@ function sortCoins(balances: CoinBalanceType[]) {
     });
 }
 
-export function useSortedCoinsByCategories(coinBalances: CoinBalanceType[]) {
-    const recognizedPackages = useRecognizedPackages();
-    const [pinnedCoinTypes] = usePinnedCoinTypes();
+export function useSortedCoinsByCategories(coinBalances: CoinBalance[]) {
+    const recognizedPackages = DEFAULT_RECOGNIZED_PACKAGES; // previous: useRecognizedPackages();
+
+    // Commented out pinnedCoinTypes until https://github.com/iotaledger/iota/issues/832 is resolved
+    // const [pinnedCoinTypes] = usePinnedCoinTypes();
 
     return useMemo(() => {
         const reducedCoinBalances = coinBalances?.reduce(
             (acc, coinBalance) => {
                 if (recognizedPackages.includes(coinBalance.coinType.split('::')[0])) {
                     acc.recognized.push(coinBalance);
-                } else if (pinnedCoinTypes.includes(coinBalance.coinType)) {
-                    acc.pinned.push(coinBalance);
-                } else {
+                }
+                // else if (pinnedCoinTypes.includes(coinBalance.coinType)) {
+                //     acc.pinned.push(coinBalance);
+                // }
+                else {
                     acc.unrecognized.push(coinBalance);
                 }
                 return acc;
             },
             {
-                recognized: [] as CoinBalanceType[],
-                pinned: [] as CoinBalanceType[],
-                unrecognized: [] as CoinBalanceType[],
+                recognized: [] as CoinBalance[],
+                pinned: [] as CoinBalance[],
+                unrecognized: [] as CoinBalance[],
             },
         ) ?? { recognized: [], pinned: [], unrecognized: [] };
 
@@ -46,5 +49,5 @@ export function useSortedCoinsByCategories(coinBalances: CoinBalanceType[]) {
             pinned: sortCoins(reducedCoinBalances.pinned),
             unrecognized: sortCoins(reducedCoinBalances.unrecognized),
         };
-    }, [coinBalances, recognizedPackages, pinnedCoinTypes]);
+    }, [coinBalances, recognizedPackages /*pinnedCoinTypes*/]);
 }

apps/core/src/utils/filterAndSortTokenBalances.ts

@@ -3,8 +3,8 @@
 
 import { type CoinBalance } from '@iota/iota.js/client';
 import { getCoinSymbol } from '../hooks';
-import { IOTA_TYPE_ARG } from '@iota/iota.js/utils';
 
+// Move this to the API backend https://github.com/iotaledger/iota/issues/922
 /**
  * Filter and sort token balances by symbol and total balance.
  * IOTA tokens are always sorted first.
@@ -14,15 +14,9 @@ import { IOTA_TYPE_ARG } from '@iota/iota.js/utils';
 export function filterAndSortTokenBalances(tokens: CoinBalance[]) {
     return tokens
         .filter((token) => Number(token.totalBalance) > 0)
-        .sort((a, b) => {
-            if (a.coinType === IOTA_TYPE_ARG && b.coinType !== IOTA_TYPE_ARG) {
-                return -1;
-            } else if (a.coinType !== IOTA_TYPE_ARG && b.coinType === IOTA_TYPE_ARG) {
-                return 1;
-            }
-
-            return (getCoinSymbol(a.coinType) + Number(a.totalBalance)).localeCompare(
-                getCoinSymbol(a.coinType) + Number(b.totalBalance),
-            );
-        });
+        .sort((a, b) =>
+            (getCoinSymbol(a.coinType) + Number(a.totalBalance)).localeCompare(
+                getCoinSymbol(b.coinType) + Number(b.totalBalance),
+            ),
+        );
 }

apps/wallet-dashboard/app/dashboard/home/page.tsx

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 'use client';
 
-import { AccountBalance, AllCoins, Button, NewStakePopup } from '@/components';
+import { AccountBalance, MyCoins, Button, NewStakePopup } from '@/components';
 import { usePopups } from '@/hooks';
 import { useCurrentAccount, useCurrentWallet } from '@iota/dapp-kit';
 
@@ -23,7 +23,7 @@ function HomeDashboardPage(): JSX.Element {
                     <h1>Welcome</h1>
                     <div>Address: {account.address}</div>
                     <AccountBalance />
-                    <AllCoins />
+                    <MyCoins />
                     <Button onClick={addNewStake}>New Stake</Button>
                 </div>
             )}

apps/wallet-dashboard/components/Coins/MyCoins.tsx

@@ -0,0 +1,74 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import React from 'react';
+import { useCurrentAccount, useIotaClientQuery } from '@iota/dapp-kit';
+import { CoinItem, SendCoinPopup } from '@/components';
+import { usePopups } from '@/hooks';
+import { CoinBalance } from '@iota/iota.js/client';
+import {
+    COINS_QUERY_REFETCH_INTERVAL,
+    COINS_QUERY_STALE_TIME,
+    filterAndSortTokenBalances,
+    useSortedCoinsByCategories,
+} from '@iota/core';
+
+function MyCoins(): React.JSX.Element {
+    const { openPopup, closePopup } = usePopups();
+    const account = useCurrentAccount();
+    const activeAccountAddress = account?.address;
+
+    const { data: coinBalances } = useIotaClientQuery(
+        'getAllBalances',
+        { owner: activeAccountAddress! },
+        {
+            enabled: !!activeAccountAddress,
+            staleTime: COINS_QUERY_STALE_TIME,
+            refetchInterval: COINS_QUERY_REFETCH_INTERVAL,
+            select: filterAndSortTokenBalances,
+        },
+    );
+    const { recognized, unrecognized } = useSortedCoinsByCategories(coinBalances ?? []);
+
+    function openSendTokenPopup(coin: CoinBalance, address: string): void {
+        if (coinBalances) {
+            openPopup(
+                <SendCoinPopup
+                    coin={coin}
+                    senderAddress={address}
+                    onClose={closePopup}
+                    coins={coinBalances}
+                />,
+            );
+        }
+    }
+
+    return (
+        <div className="flex w-2/3 flex-col items-center space-y-2">
+            <h3>My Coins:</h3>
+            {recognized?.map((coin, index) => {
+                return (
+                    <CoinItem
+                        key={index}
+                        coinType={coin.coinType}
+                        balance={BigInt(coin.totalBalance)}
+                        onClick={() => openSendTokenPopup(coin, account?.address ?? '')}
+                    />
+                );
+            })}
+            <span>Unrecognized coins</span>
+            {unrecognized?.map((coin, index) => {
+                return (
+                    <CoinItem
+                        key={index}
+                        coinType={coin.coinType}
+                        balance={BigInt(coin.totalBalance)}
+                        onClick={() => openSendTokenPopup(coin, account?.address ?? '')}
+                    />
+                );
+            })}
+        </div>
+    );
+}
+
+export default MyCoins;

apps/wallet-dashboard/components/Coins/index.ts

@@ -1,5 +1,5 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-export { default as AllCoins } from './AllCoins';
+export { default as MyCoins } from './MyCoins';
 export { default as CoinItem } from './CoinItem';

apps/wallet-dashboard/components/Dropdown.tsx

@@ -0,0 +1,53 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import React from 'react';
+
+interface DropdownProps<T> {
+    options: T[];
+    selectedOption: T | null | undefined;
+    onChange: (selectedOption: T) => void;
+    placeholder?: string;
+    disabled?: boolean;
+    getOptionId: (option: T) => string | number;
+}
+
+function Dropdown<T>({
+    options,
+    selectedOption,
+    onChange,
+    placeholder,
+    disabled = false,
+    getOptionId,
+}: DropdownProps<T>): JSX.Element {
+    function handleSelectionChange(e: React.ChangeEvent<HTMLSelectElement>): void {
+        const selectedKey = e.target.value;
+        const selectedOption = options.find((option) => getOptionId(option) === selectedKey);
+        if (selectedOption) {
+            onChange(selectedOption);
+        }
+    }
+
+    return (
+        <select
+            value={selectedOption ? getOptionId(selectedOption) : ''}
+            onChange={handleSelectionChange}
+            className="px-2 py-3"
+            disabled={disabled}
+        >
+            {placeholder && (
+                <option value="" disabled>
+                    {placeholder}
+                </option>
+            )}
+
+            {options.map((option, index) => (
+                <option key={index} value={getOptionId(option)}>
+                    {getOptionId(option)}
+                </option>
+            ))}
+        </select>
+    );
+}
+
+export default Dropdown;