Merge branch 'develop' into tooling/fix-inconsistencies-in-tx-history

iotaledger · Dec 27, 2024 · aa6ff76 · aa6ff76
2 parents 691a00b + ab9526d
commit aa6ff76
Show file tree

Hide file tree

Showing 16 changed files with 86 additions and 183 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -4,3 +4,37 @@ documentation:
 explorer:
   - changed-files:
       - any-glob-to-any-file: apps/explorer/**/*
+wallet:
+  - changed-files:
+      - any-glob-to-any-file: apps/wallet/**/*
+wallet-dashboard:
+  - changed-files:
+      - any-glob-to-any-file: apps/wallet-dashboard/**/*
+ts-sdk:
+  - changed-files:
+      - any-glob-to-any-file: sdk/**/*
+apps-ui-kit:
+  - changed-files:
+      - any-glob-to-any-file: apps/ui-kit/**/*
+apps-backend:
+  - changed-files:
+      - any-glob-to-any-file: apps/apps-backend/**/*
+tooling:
+  - changed-files:
+      - any-glob-to-any-file: |
+          sdk/**
+          apps/**
+          dapps/**
+          linting/**
+          .husky/**
+          .changeset/**
+          .eslintrc.js
+          .lintstagedrc.json
+          .npmrc
+          .prettierignore
+          graphql.config.ts
+          package.json
+          pnpm-workspace.yaml
+          prettier.config.js
+          turbo.json
+          vercel.json
diff --git a/apps/explorer/src/lib/ui/utils/generateTransactionsTableColumns.tsx b/apps/explorer/src/lib/ui/utils/generateTransactionsTableColumns.tsx
@@ -89,11 +89,12 @@ export function generateTransactionsTableColumns(): ColumnDef<IotaTransactionBlo
             accessorKey: 'timestampMs',
             cell: ({ getValue }) => {
                 const timestampMs = getValue();
+                const elapsedTime = timestampMs
+                    ? getElapsedTime(Number(timestampMs), Date.now())
+                    : '--';
                 return (
                     <TableCellBase>
-                        <TableCellText>
-                            {getElapsedTime(Number(timestampMs), Date.now()) || '--'}
-                        </TableCellText>
+                        <TableCellText>{elapsedTime}</TableCellText>
                     </TableCellBase>
                 );
             },

diff --git a/apps/wallet-dashboard/app/(protected)/layout.tsx b/apps/wallet-dashboard/app/(protected)/layout.tsx
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 'use client';
 
-import { Notifications } from '@/components/index';
 import React, { type PropsWithChildren } from 'react';
 import { Sidebar, TopNav } from './components';
 
@@ -22,7 +21,6 @@ function DashboardLayout({ children }: PropsWithChildren): JSX.Element {
                     <div className="flex-1 py-md--rs">{children}</div>
                 </div>
             </div>
-            <Notifications />
         </div>
     );
 }

diff --git a/apps/wallet-dashboard/app/(protected)/vesting/page.tsx b/apps/wallet-dashboard/app/(protected)/vesting/page.tsx
@@ -13,9 +13,8 @@ import {
 } from '@/components';
 import { UnstakeDialogView } from '@/components/Dialogs/unstake/enums';
 import { useUnstakeDialog } from '@/components/Dialogs/unstake/hooks';
-import { useGetSupplyIncreaseVestingObjects, useNotifications } from '@/hooks';
+import { useGetSupplyIncreaseVestingObjects } from '@/hooks';
 import { groupTimelockedStakedObjects, TimelockedStakedObjectsGrouped } from '@/lib/utils';
-import { NotificationType } from '@/stores/notificationStore';
 import { useFeature } from '@growthbook/growthbook-react';
 import {
     Panel,
@@ -56,6 +55,7 @@ import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { StakedTimelockObject } from '@/components';
 import { IotaSignAndExecuteTransactionOutput } from '@iota/wallet-standard';
+import toast from 'react-hot-toast';
 
 export default function VestingDashboardPage(): JSX.Element {
     const [timelockedObjectsToUnstake, setTimelockedObjectsToUnstake] =
@@ -66,7 +66,6 @@ export default function VestingDashboardPage(): JSX.Element {
     const router = useRouter();
     const { data: system } = useIotaClientQuery('getLatestIotaSystemState');
     const [isVestingScheduleDialogOpen, setIsVestingScheduleDialogOpen] = useState(false);
-    const { addNotification } = useNotifications();
     const { data: activeValidators } = useGetActiveValidatorsInfo();
     const { mutateAsync: signAndExecuteTransaction } = useSignAndExecuteTransaction();
     const { theme } = useTheme();
@@ -163,7 +162,7 @@ export default function VestingDashboardPage(): JSX.Element {
 
     const handleCollect = () => {
         if (!unlockAllSupplyIncreaseVesting?.transactionBlock) {
-            addNotification('Failed to create a Transaction', NotificationType.Error);
+            toast.error('Failed to create a Transaction');
             return;
         }
         signAndExecuteTransaction(
@@ -177,10 +176,10 @@ export default function VestingDashboardPage(): JSX.Element {
             },
         )
             .then(() => {
-                addNotification('Collect transaction has been sent');
+                toast.success('Collect transaction has been sent');
             })
             .catch(() => {
-                addNotification('Collect transaction was not sent', NotificationType.Error);
+                toast.error('Collect transaction was not sent');
             });
     };
 

diff --git a/apps/wallet-dashboard/components/Dialogs/Assets/AssetDialog.tsx b/apps/wallet-dashboard/components/Dialogs/Assets/AssetDialog.tsx
@@ -9,10 +9,10 @@ import { createNftSendValidationSchema } from '@iota/core';
 import { DetailsView, SendView } from './views';
 import { IotaObjectData } from '@iota/iota-sdk/client';
 import { AssetsDialogView } from './constants';
-import { useCreateSendAssetTransaction, useNotifications } from '@/hooks';
-import { NotificationType } from '@/stores/notificationStore';
+import { useCreateSendAssetTransaction } from '@/hooks';
 import { TransactionDetailsView } from '../SendToken';
 import { DialogLayout } from '../layout';
+import toast from 'react-hot-toast';
 
 interface AssetsDialogProps {
     onClose: () => void;
@@ -34,7 +34,6 @@ export function AssetDialog({ onClose, asset, refetchAssets }: AssetsDialogProps
     const [digest, setDigest] = useState<string>('');
     const activeAddress = account?.address ?? '';
     const objectId = asset?.objectId ?? '';
-    const { addNotification } = useNotifications();
     const iotaClient = useIotaClient();
     const validationSchema = createNftSendValidationSchema(activeAddress, objectId);
 
@@ -57,10 +56,10 @@ export function AssetDialog({ onClose, asset, refetchAssets }: AssetsDialogProps
 
             setDigest(tx.digest);
             refetchAssets();
-            addNotification('Transfer transaction successful', NotificationType.Success);
+            toast.success('Transfer transaction successful');
             setView(AssetsDialogView.TransactionDetails);
         } catch {
-            addNotification('Transfer transaction failed', NotificationType.Error);
+            toast.error('Transfer transaction failed');
         }
     }
 

diff --git a/apps/wallet-dashboard/components/Dialogs/SendToken/SendTokenDialog.tsx b/apps/wallet-dashboard/components/Dialogs/SendToken/SendTokenDialog.tsx
@@ -4,14 +4,14 @@
 import React, { useState } from 'react';
 import { EnterValuesFormView, ReviewValuesFormView, TransactionDetailsView } from './views';
 import { CoinBalance } from '@iota/iota-sdk/client';
-import { useSendCoinTransaction, useNotifications } from '@/hooks';
-import { NotificationType } from '@/stores/notificationStore';
+import { useSendCoinTransaction } from '@/hooks';
 import { CoinFormat, useFormatCoin, useGetAllCoins } from '@iota/core';
 import { Dialog, DialogContent, DialogPosition } from '@iota/apps-ui-kit';
 import { FormDataValues } from './interfaces';
 import { INITIAL_VALUES } from './constants';
 import { IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
 import { useTransferTransactionMutation } from '@/hooks';
+import toast from 'react-hot-toast';
 
 interface SendCoinDialogProps {
     coin: CoinBalance;
@@ -37,7 +37,6 @@ function SendTokenDialogBody({
     const [fullAmount] = useFormatCoin(formData.amount, selectedCoin.coinType, CoinFormat.FULL);
     const { data: coinsData } = useGetAllCoins(selectedCoin.coinType, activeAddress);
 
-    const { addNotification } = useNotifications();
     const isPayAllIota =
         selectedCoin.totalBalance === formData.amount && selectedCoin.coinType === IOTA_TYPE_ARG;
 
@@ -58,18 +57,18 @@ function SendTokenDialogBody({
 
     async function handleTransfer() {
         if (!transaction) {
-            addNotification('There was an error with the transaction', NotificationType.Error);
+            toast.error('There was an error with the transaction');
             return;
         }
 
         transfer(transaction, {
             onSuccess: () => {
                 setStep(FormStep.TransactionDetails);
-                addNotification('Transfer transaction has been sent', NotificationType.Success);
+                toast.success('Transfer transaction has been sent');
             },
             onError: () => {
                 setOpen(false);
-                addNotification('Transfer transaction failed', NotificationType.Error);
+                toast.error('Transfer transaction failed');
             },
         });
     }

diff --git a/apps/wallet-dashboard/components/Dialogs/Staking/views/EnterAmountView.tsx b/apps/wallet-dashboard/components/Dialogs/Staking/views/EnterAmountView.tsx
@@ -6,9 +6,9 @@ import { useFormatCoin, useBalance, CoinFormat, parseAmount, useCoinMetadata } f
 import { IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
 import { useFormikContext } from 'formik';
 import { useSignAndExecuteTransaction } from '@iota/dapp-kit';
-import { useNewStakeTransaction, useNotifications } from '@/hooks';
-import { NotificationType } from '@/stores/notificationStore';
+import { useNewStakeTransaction } from '@/hooks';
 import EnterAmountDialogLayout from './EnterAmountDialogLayout';
+import toast from 'react-hot-toast';
 
 export interface FormValues {
     amount: string;
@@ -32,7 +32,6 @@ function EnterAmountView({
     senderAddress,
     onSuccess,
 }: EnterAmountViewProps): JSX.Element {
-    const { addNotification } = useNotifications();
     const { mutateAsync: signAndExecuteTransaction } = useSignAndExecuteTransaction();
     const { values, resetForm } = useFormikContext<FormValues>();
 
@@ -65,7 +64,7 @@ function EnterAmountView({
 
     function handleStake(): void {
         if (!newStakeData?.transaction) {
-            addNotification('Stake transaction was not created', NotificationType.Error);
+            toast.error('Stake transaction was not created');
             return;
         }
         signAndExecuteTransaction(
@@ -75,11 +74,11 @@ function EnterAmountView({
             {
                 onSuccess: (tx) => {
                     onSuccess(tx.digest);
-                    addNotification('Stake transaction has been sent');
+                    toast.success('Stake transaction has been sent');
                     resetForm();
                 },
                 onError: () => {
-                    addNotification('Stake transaction was not sent', NotificationType.Error);
+                    toast.error('Stake transaction was not sent');
                 },
             },
         );

diff --git a/apps/wallet-dashboard/components/Dialogs/Staking/views/EnterTimelockedAmountView.tsx b/apps/wallet-dashboard/components/Dialogs/Staking/views/EnterTimelockedAmountView.tsx
@@ -12,14 +12,10 @@ import {
 import { IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
 import { useFormikContext } from 'formik';
 import { useSignAndExecuteTransaction } from '@iota/dapp-kit';
-import {
-    useGetCurrentEpochStartTimestamp,
-    useNewStakeTimelockedTransaction,
-    useNotifications,
-} from '@/hooks';
-import { NotificationType } from '@/stores/notificationStore';
+import { useGetCurrentEpochStartTimestamp, useNewStakeTimelockedTransaction } from '@/hooks';
 import { prepareObjectsForTimelockedStakingTransaction } from '@/lib/utils';
 import EnterAmountDialogLayout from './EnterAmountDialogLayout';
+import toast from 'react-hot-toast';
 
 export interface FormValues {
     amount: string;
@@ -44,7 +40,6 @@ function EnterTimelockedAmountView({
     handleClose,
     onSuccess,
 }: EnterTimelockedAmountViewProps): JSX.Element {
-    const { addNotification } = useNotifications();
     const { mutateAsync: signAndExecuteTransaction } = useSignAndExecuteTransaction();
     const { resetForm } = useFormikContext<FormValues>();
 
@@ -84,11 +79,11 @@ function EnterTimelockedAmountView({
 
     function handleStake(): void {
         if (groupedTimelockObjects.length === 0) {
-            addNotification('Invalid stake amount. Please try again.', NotificationType.Error);
+            toast.error('Invalid stake amount. Please try again.');
             return;
         }
         if (!newStakeData?.transaction) {
-            addNotification('Stake transaction was not created', NotificationType.Error);
+            toast.error('Stake transaction was not created');
             return;
         }
         signAndExecuteTransaction(
@@ -98,11 +93,11 @@ function EnterTimelockedAmountView({
             {
                 onSuccess: (tx) => {
                     onSuccess?.(tx.digest);
-                    addNotification('Stake transaction has been sent');
+                    toast.success('Stake transaction has been sent');
                     resetForm();
                 },
                 onError: () => {
-                    addNotification('Stake transaction was not sent', NotificationType.Error);
+                    toast.error('Stake transaction was not sent');
                 },
             },
         );

diff --git a/apps/wallet-dashboard/components/Dialogs/unstake/views/UnstakeTimelockedObjectsView.tsx b/apps/wallet-dashboard/components/Dialogs/unstake/views/UnstakeTimelockedObjectsView.tsx
@@ -4,7 +4,7 @@
 import { StakeRewardsPanel, ValidatorStakingData } from '@/components';
 import { DialogLayout, DialogLayoutBody, DialogLayoutFooter } from '../../layout';
 import { Validator } from '../../Staking/views/Validator';
-import { useNewUnstakeTimelockedTransaction, useNotifications } from '@/hooks';
+import { useNewUnstakeTimelockedTransaction } from '@/hooks';
 import {
     Collapsible,
     TimeUnit,
@@ -24,7 +24,7 @@ import {
 } from '@iota/apps-ui-kit';
 import { useCurrentAccount, useSignAndExecuteTransaction } from '@iota/dapp-kit';
 import { IotaSignAndExecuteTransactionOutput } from '@iota/wallet-standard';
-import { NotificationType } from '@/stores/notificationStore';
+import toast from 'react-hot-toast';
 
 interface UnstakeTimelockedObjectsViewProps {
     onClose: () => void;
@@ -39,7 +39,6 @@ export function UnstakeTimelockedObjectsView({
     onBack,
     onSuccess,
 }: UnstakeTimelockedObjectsViewProps) {
-    const { addNotification } = useNotifications();
     const activeAddress = useCurrentAccount()?.address ?? '';
     const { data: activeValidators } = useGetActiveValidatorsInfo();
 
@@ -71,7 +70,7 @@ export function UnstakeTimelockedObjectsView({
     );
 
     function handleCopySuccess() {
-        addNotification('Copied to clipboard');
+        toast.success('Copied to clipboard');
     }
 
     async function handleUnstake(): Promise<void> {
@@ -83,12 +82,12 @@ export function UnstakeTimelockedObjectsView({
             },
             {
                 onSuccess: (tx) => {
-                    addNotification('Unstake transaction has been sent');
+                    toast.success('Unstake transaction has been sent');
                     onSuccess(tx);
                 },
             },
         ).catch(() => {
-            addNotification('Unstake transaction was not sent', NotificationType.Error);
+            toast.error('Unstake transaction was not sent');
         });
     }
 

diff --git a/apps/wallet-dashboard/components/Dialogs/unstake/views/UnstakeView.tsx b/apps/wallet-dashboard/components/Dialogs/unstake/views/UnstakeView.tsx
@@ -24,9 +24,9 @@ import { Warning } from '@iota/ui-icons';
 import { StakeRewardsPanel, ValidatorStakingData } from '@/components';
 import { DialogLayout, DialogLayoutFooter, DialogLayoutBody } from '../../layout';
 import { Validator } from '../../Staking/views/Validator';
-import { useNewUnstakeTransaction, useNotifications } from '@/hooks';
+import { useNewUnstakeTransaction } from '@/hooks';
 import { IotaSignAndExecuteTransactionOutput } from '@iota/wallet-standard';
-import { NotificationType } from '@/stores/notificationStore';
+import toast from 'react-hot-toast';
 
 interface UnstakeDialogProps {
     extendedStake: ExtendedDelegatedStake;
@@ -44,7 +44,6 @@ export function UnstakeView({
     showActiveStatus,
 }: UnstakeDialogProps): JSX.Element {
     const activeAddress = useCurrentAccount()?.address ?? '';
-    const { addNotification } = useNotifications();
     const { data: unstakeData, isPending: isUnstakeTxPending } = useNewUnstakeTransaction(
         activeAddress,
         extendedStake.stakedIotaId,
@@ -81,12 +80,12 @@ export function UnstakeView({
             },
             {
                 onSuccess: (tx) => {
-                    addNotification('Unstake transaction has been sent');
+                    toast.success('Unstake transaction has been sent');
                     onSuccess(tx);
                 },
             },
         ).catch(() => {
-            addNotification('Unstake transaction was not sent', NotificationType.Error);
+            toast.error('Unstake transaction was not sent');
         });
     }