Merge branch 'develop' into tooling-sdk/remove-deprecated-wallet-stan…

…dard-methods
iotaledger · Oct 29, 2024 · 8eb0978 · 8eb0978
2 parents 533acd3 + 8882941
commit 8eb0978
Show file tree

Hide file tree

Showing 477 changed files with 6,782 additions and 20,492 deletions.
diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md
@@ -10,7 +10,6 @@ title: '[Task(*)]: release version x.y.z'
 - [ ] Edit `crates/iota-open-rpc/spec/openrpc.json`
 - [ ] Update `sdk/typescript/src/version.ts` (`pnpm sdk build`)
 - [ ] Update `Cargo.lock` (`cargo check`)
-- [ ] Update `crates/iota-framework/packages/deepbook/Move.lock`
 - [ ] Update `crates/iota-framework/packages/iota-framework/Move.lock`
 - [ ] Update `crates/iota-framework/packages/iota-system/Move.lock`
 - [ ] Update `crates/iota-framework/packages/move-stdlib/Move.lock`

diff --git a/.github/workflows/_rust_tests.yml b/.github/workflows/_rust_tests.yml
@@ -72,8 +72,7 @@ jobs:
 
   check-unused-deps:
     name: Check Unused Dependencies (${{ matrix.flags }})
-    # Temporarily disabled until the nightly build bug is resolved
-    if: (!cancelled() && false)
+    if: (!cancelled())
     strategy:
       matrix:
         flags: ["--all-features", "--no-default-features"]

diff --git a/.github/workflows/_vercel_deploy.yml b/.github/workflows/_vercel_deploy.yml
@@ -43,7 +43,7 @@ jobs:
 
   explorer-prod:
     name: Vercel Explorer Production
-    if: inputs.isDevelop && inputs.isExplorer
+    if: inputs.isDevelop
     uses: ./.github/workflows/apps-explorer.deploy.yml
     secrets: inherit
     with:
@@ -59,7 +59,7 @@ jobs:
 
   ui-kit-prod:
     name: Vercel UI Kit Preview
-    if: inputs.isDevelop && inputs.isAppsUiKit
+    if: inputs.isDevelop
     uses: ./.github/workflows/apps-ui-kit.deploy.yml
     secrets: inherit
     with:
@@ -75,7 +75,7 @@ jobs:
 
   wallet-dashboard-prod:
     name: Vercel Wallet Dashboard Production
-    if: inputs.isDevelop && inputs.isWalletDashboard
+    if: inputs.isDevelop
     uses: ./.github/workflows/apps-wallet-dashboard.deploy.yml
     secrets: inherit
     with:
@@ -91,7 +91,7 @@ jobs:
 
   apps-backend-prod:
     name: Vercel apps-backend Production
-    if: inputs.isDevelop && inputs.isAppsBackend
+    if: inputs.isDevelop
     uses: ./.github/workflows/apps-backend.deploy.yml
     secrets: inherit
     with:

diff --git a/.gitignore b/.gitignore
@@ -23,7 +23,6 @@ Move.lock
 !crates/iota-framework/packages/move-stdlib/Move.lock
 !crates/iota-framework/packages/iota-framework/Move.lock
 !crates/iota-framework/packages/iota-system/Move.lock
-!crates/iota-framework/packages/deepbook/Move.lock
 !crates/iota-framework/packages/stardust/Move.lock
 !crates/iota-framework/packages/timelock/Move.lock
 .trace

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/explorer/src/components/IotaTokenCard.tsx b/apps/explorer/src/components/IotaTokenCard.tsx
@@ -4,8 +4,9 @@
 
 import { Panel } from '@iota/apps-ui-kit';
 import { COIN_GECKO_IOTA_URL, useIotaCoinData } from '@iota/core';
-import { IotaLogoMark } from '@iota/ui-icons';
-import { ButtonOrLink } from '~/components/ui';
+import { ButtonOrLink, ImageIconSize } from '~/components/ui';
+import { CoinIcon } from './owned-coins';
+import { IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
 
 export function IotaTokenCard(): JSX.Element {
     const { data } = useIotaCoinData();
@@ -22,8 +23,8 @@ export function IotaTokenCard(): JSX.Element {
         <ButtonOrLink href={COIN_GECKO_IOTA_URL}>
             <Panel>
                 <div className="flex items-center gap-xs p-md--rs">
-                    <div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-primary-30">
-                        <IotaLogoMark className="h-5 w-5 text-white" />
+                    <div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-full border border-shader-neutral-light-8 text-neutral-10">
+                        <CoinIcon coinType={IOTA_TYPE_ARG} size={ImageIconSize.Small} />
                     </div>
                     <div className="flex w-full flex-col gap-xxxs">
                         <span className="font-inter text-title-lg text-neutral-10 dark:text-neutral-92">

diff --git a/apps/explorer/src/components/activity/EpochsActivityTable.tsx b/apps/explorer/src/components/activity/EpochsActivityTable.tsx
@@ -2,13 +2,13 @@
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { InfoBox, InfoBoxStyle, InfoBoxType, Select } from '@iota/apps-ui-kit';
+import { InfoBox, InfoBoxStyle, InfoBoxType, Select, SelectSize } from '@iota/apps-ui-kit';
 import { useIotaClientQuery, useIotaClient, useIotaClientInfiniteQuery } from '@iota/dapp-kit';
 import { Warning } from '@iota/ui-icons';
 import { useQuery } from '@tanstack/react-query';
 import { useState } from 'react';
-
 import { PlaceholderTable, TableCard, useCursorPagination } from '~/components/ui';
+import { PAGE_SIZES_RANGE_20_60 } from '~/lib/constants';
 import { generateEpochsTableColumns } from '~/lib/ui';
 import { numberSuffix } from '~/lib/utils';
 
@@ -71,29 +71,26 @@ export function EpochsActivityTable({
                     data={data.data}
                     columns={tableColumns}
                     totalLabel={count ? `${numberSuffix(Number(count))} Total` : '-'}
-                    viewAll={!disablePagination ? '/recent?tab=epochs' : undefined}
+                    viewAll="/recent?tab=epochs"
                     paginationOptions={!disablePagination ? pagination : undefined}
+                    pageSizeSelector={
+                        !disablePagination && (
+                            <Select
+                                value={limit.toString()}
+                                options={PAGE_SIZES_RANGE_20_60.map((size) => ({
+                                    label: `${size} / page`,
+                                    id: size.toString(),
+                                }))}
+                                size={SelectSize.Small}
+                                onValueChange={(e) => {
+                                    setLimit(Number(e));
+                                    pagination.onFirst();
+                                }}
+                            />
+                        )
+                    }
                 />
             )}
-
-            <div className="flex justify-between">
-                <div className="flex items-center space-x-3">
-                    {!disablePagination && (
-                        <Select
-                            value={limit.toString()}
-                            options={[
-                                { id: '20', label: '20 Per Page' },
-                                { id: '40', label: '40 Per Page' },
-                                { id: '60', label: '60 Per Page' },
-                            ]}
-                            onValueChange={(e) => {
-                                setLimit(Number(e));
-                                pagination.onFirst();
-                            }}
-                        />
-                    )}
-                </div>
-            </div>
         </div>
     );
 }
diff --git a/apps/explorer/src/components/activity/TransactionsActivityTable.tsx b/apps/explorer/src/components/activity/TransactionsActivityTable.tsx
@@ -5,16 +5,16 @@
 import { useIotaClient } from '@iota/dapp-kit';
 import { useQuery } from '@tanstack/react-query';
 import { useEffect, useRef, useState } from 'react';
-
 import { PlaceholderTable, TableCard, useCursorPagination } from '~/components/ui';
 import {
     DEFAULT_TRANSACTIONS_LIMIT,
     useGetTransactionBlocks,
 } from '~/hooks/useGetTransactionBlocks';
 import { numberSuffix } from '~/lib/utils';
-import { InfoBox, InfoBoxStyle, InfoBoxType, Select } from '@iota/apps-ui-kit';
+import { InfoBox, InfoBoxStyle, InfoBoxType, Select, SelectSize } from '@iota/apps-ui-kit';
 import { generateTransactionsTableColumns } from '~/lib/ui';
 import { Warning } from '@iota/ui-icons';
+import { PAGE_SIZES_RANGE_20_60 } from '~/lib/constants';
 
 interface TransactionsActivityTableProps {
     disablePagination?: boolean;
@@ -76,27 +76,24 @@ export function TransactionsActivityTable({
                         totalLabel={count ? `${numberSuffix(Number(count))} Total` : '-'}
                         viewAll="/recent"
                         paginationOptions={!disablePagination ? pagination : undefined}
+                        pageSizeSelector={
+                            !disablePagination && (
+                                <Select
+                                    value={limit.toString()}
+                                    options={PAGE_SIZES_RANGE_20_60.map((size) => ({
+                                        label: `${size} / page`,
+                                        id: size.toString(),
+                                    }))}
+                                    onValueChange={(e) => {
+                                        setLimit(Number(e));
+                                        pagination.onFirst();
+                                    }}
+                                    size={SelectSize.Small}
+                                />
+                            )
+                        }
                     />
                 )}
-
-                <div className="flex justify-between">
-                    <div className="flex items-center space-x-3">
-                        {!disablePagination && (
-                            <Select
-                                value={limit.toString()}
-                                options={[
-                                    { id: '20', label: '20 Per Page' },
-                                    { id: '40', label: '40 Per Page' },
-                                    { id: '60', label: '60 Per Page' },
-                                ]}
-                                onValueChange={(e) => {
-                                    setLimit(Number(e));
-                                    pagination.onFirst();
-                                }}
-                            />
-                        )}
-                    </div>
-                </div>
             </div>
         </div>
     );

diff --git a/apps/explorer/src/components/checkpoints/CheckpointsTable.tsx b/apps/explorer/src/components/checkpoints/CheckpointsTable.tsx
@@ -2,12 +2,13 @@
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { InfoBox, InfoBoxStyle, InfoBoxType, Select } from '@iota/apps-ui-kit';
+import { InfoBox, InfoBoxStyle, InfoBoxType, Select, SelectSize } from '@iota/apps-ui-kit';
 import { useIotaClientQuery } from '@iota/dapp-kit';
 import { Warning } from '@iota/ui-icons';
 import { useMemo, useState } from 'react';
 import { PlaceholderTable, TableCard, useCursorPagination } from '~/components/ui';
 import { DEFAULT_CHECKPOINTS_LIMIT, useGetCheckpoints } from '~/hooks/useGetCheckpoints';
+import { PAGE_SIZES_RANGE_20_60 } from '~/lib/constants';
 import { generateCheckpointsTableColumns } from '~/lib/ui';
 import { numberSuffix } from '~/lib/utils';
 
@@ -81,26 +82,24 @@ export function CheckpointsTable({
                               }
                             : undefined
                     }
+                    pageSizeSelector={
+                        !disablePagination && (
+                            <Select
+                                value={limit.toString()}
+                                options={PAGE_SIZES_RANGE_20_60.map((size) => ({
+                                    label: `${size} / page`,
+                                    id: size.toString(),
+                                }))}
+                                size={SelectSize.Small}
+                                onValueChange={(e) => {
+                                    setLimit(Number(e));
+                                    pagination.onFirst();
+                                }}
+                            />
+                        )
+                    }
                 />
             )}
-            <div className="flex justify-between">
-                <div className="flex items-center space-x-3">
-                    {!disablePagination && (
-                        <Select
-                            value={limit.toString()}
-                            options={[
-                                { id: '20', label: '20 Per Page' },
-                                { id: '40', label: '40 Per Page' },
-                                { id: '60', label: '60 Per Page' },
-                            ]}
-                            onValueChange={(e) => {
-                                setLimit(Number(e));
-                                pagination.onFirst();
-                            }}
-                        />
-                    )}
-                </div>
-            </div>
         </div>
     );
 }