Add total staked on address page/ fix wrong digest link format

apps/core/src/hooks/useGetDelegatedStake.tsx

@@ -0,0 +1,38 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import { useSuiClient } from '@mysten/dapp-kit';
+import type { DelegatedStake } from '@mysten/sui.js/client';
+import { useQuery, type UseQueryResult } from '@tanstack/react-query';
+
+type UseGetDelegatedStakeOptions = {
+	autoRefetch?: boolean;
+};
+
+const STALE_TIME = 10_000;
+const REFETCH_INTERVAL = 30_000;
+
+export function useGetDelegatedStake(
+	address: string,
+	options?: UseGetDelegatedStakeOptions,
+): UseQueryResult<DelegatedStake[], Error> {
+	const client = useSuiClient();
+	const { autoRefetch = false } = options || {};
+
+	// Generalized query options
+	const refetchQueryOptions = {
+		staleTime: STALE_TIME,
+		refetchInterval: REFETCH_INTERVAL,
+	};
+
+	const defaultQueryOptions = {
+		staleTime: Infinity,
+		refetchInterval: false,
+	} as const;
+
+	return useQuery({
+		queryKey: ['delegated-stakes', address],
+		queryFn: () => client.getStakes({ owner: address }),
+		...(autoRefetch ? refetchQueryOptions : defaultQueryOptions),
+	});
+}

apps/core/src/index.ts

@@ -34,3 +34,4 @@ export * from './utils/kiosk';
 export * from './hooks/useElementDimensions';
 export * from './hooks/useSuiCoinData';
 export * from './hooks/useLocalStorage';
+export * from './hooks/useGetDelegatedStake';

apps/core/tailwind.config.ts

@@ -203,6 +203,7 @@ export default {
 			minWidth: {
 				10: '2.5rem',
 				18: '4.5rem',
+				44: '11rem',
 				50: '12.5rem',
 				transactionColumn: '31.875rem',
 				smallThumbNailsViewContainer: '13.125rem',

apps/explorer/src/pages/address-result/AddressResult.tsx

@@ -16,6 +16,7 @@ import { Divider } from '~/ui/Divider';
 import { PageHeader } from '~/ui/PageHeader';
 import { LOCAL_STORAGE_SPLIT_PANE_KEYS, SplitPanes } from '~/ui/SplitPanes';
 import { TabHeader, TabsList, TabsTrigger } from '~/ui/Tabs';
+import { TotalStaked } from './TotalStaked';
 
 const LEFT_RIGHT_PANEL_MIN_SIZE = 30;
 const TOP_PANEL_MIN_SIZE = 20;
@@ -30,6 +31,7 @@ function AddressResultPageHeader({ address, loading }: { address: string; loadin
 			title={address}
 			subtitle={domainName}
 			before={<Domain32 className="h-6 w-6 text-steel-darker sm:h-10 sm:w-10" />}
+			after={<TotalStaked address={address} />}
 		/>
 	);
 }

apps/explorer/src/pages/address-result/TotalStaked.tsx

@@ -0,0 +1,36 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import { useFormatCoin, useGetDelegatedStake } from '@mysten/core';
+import { useMemo } from 'react';
+import { SUI_TYPE_ARG } from '@mysten/sui.js/utils';
+import { Text, Heading } from '@mysten/ui';
+import { Sui } from '@mysten/icons';
+
+export function TotalStaked({ address }: { address: string }) {
+	const { data: delegatedStake } = useGetDelegatedStake(address);
+
+	// Total active stake for all delegations
+	const totalActivePendingStake = useMemo(() => {
+		if (!delegatedStake) return 0n;
+		return delegatedStake.reduce(
+			(acc, curr) => curr.stakes.reduce((total, { principal }) => total + BigInt(principal), acc),
+			0n,
+		);
+	}, [delegatedStake]);
+
+	const [formatted, symbol] = useFormatCoin(totalActivePendingStake, SUI_TYPE_ARG);
+	return totalActivePendingStake ? (
+		<div className="flex min-w-44 items-center justify-start gap-3 rounded-xl bg-white/60 px-4 py-3 backdrop-blur-sm">
+			<Sui className="flex h-8 w-8 items-center justify-center rounded-full bg-sui-primaryBlue2023 py-1.5 text-white" />
+			<div className="flex flex-col">
+				<Text variant="pBody/semibold" color="steel-dark" uppercase>
+					Staking
+				</Text>
+				<Heading variant="heading6/semibold" color="hero-darkest-80" as="div">
+					{formatted} {symbol}
+				</Heading>
+			</div>
+		</div>
+	) : null;
+}

apps/explorer/src/ui/InternalLink.tsx

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { isSuiNSName } from '@mysten/core';
-import { formatAddress } from '@mysten/sui.js/utils';
+import { formatAddress, formatDigest } from '@mysten/sui.js/utils';
 import { type ReactNode } from 'react';
 
 import { Link, type LinkProps } from '~/ui/Link';
@@ -47,5 +47,5 @@ export const AddressLink = createInternalLink('address', 'address', (addressOrNs
 	return formatAddress(addressOrNs);
 });
 export const ObjectLink = createInternalLink('object', 'objectId', formatAddress);
-export const TransactionLink = createInternalLink('txblock', 'digest', formatAddress);
+export const TransactionLink = createInternalLink('txblock', 'digest', formatDigest);
 export const ValidatorLink = createInternalLink('validator', 'address', formatAddress);

apps/explorer/src/ui/PageHeader.tsx

@@ -16,6 +16,7 @@ export interface PageHeaderProps {
 	type: PageHeaderType;
 	status?: 'success' | 'failure';
 	before?: React.ReactNode;
+	after?: React.ReactNode;
 	error?: string;
 	loading?: boolean;
 }
@@ -32,20 +33,28 @@ const TYPE_TO_ICON: Record<PageHeaderType, typeof CallIcon | null> = {
 	Address: null,
 };
 
-export function PageHeader({ title, subtitle, type, before, error, loading }: PageHeaderProps) {
+export function PageHeader({
+	title,
+	subtitle,
+	type,
+	before,
+	error,
+	loading,
+	after,
+}: PageHeaderProps) {
 	const Icon = TYPE_TO_ICON[type];
 
 	return (
 		<div data-testid="pageheader" className="group">
-			<div className="flex items-center gap-3 sm:gap-5">
+			<div className="flex w-full items-center gap-3 sm:gap-5">
 				{before && (
 					<div className="self-start sm:self-center">
 						<div className="sm:min-w-16 flex h-10 w-10 min-w-10 items-center justify-center rounded-lg bg-white/60 sm:h-16 sm:w-16 sm:rounded-xl lg:h-18 lg:w-18 lg:min-w-18">
 							{loading ? <Placeholder rounded="xl" width="100%" height="100%" /> : before}
 						</div>
 					</div>
 				)}
-				<div>
+				<div className="flex w-full flex-col items-start justify-between gap-4 md:flex-row md:items-center">
 					<div>
 						<div className="mb-1 flex items-center gap-2">
 							{Icon && <Icon className="text-steel-dark" />}
@@ -96,6 +105,7 @@ export function PageHeader({ title, subtitle, type, before, error, loading }: Pa
 							</Banner>
 						</div>
 					)}
+					{after && <div className="sm:self-center md:ml-auto">{after}</div>}
 				</div>
 			</div>
 		</div>

apps/ui/src/Heading.tsx

@@ -37,6 +37,7 @@ const headingStyles = cva([], {
 			'steel-darker': 'text-steel-darker',
 			hero: 'text-hero',
 			'hero-dark': 'text-hero-dark',
+			'hero-darkest-80': 'text-hero-darkest/80',
 			success: 'text-success',
 			'success-dark': 'text-success-dark',
 		},

apps/wallet/src/ui/app/pages/home/tokens/TokenIconLink.tsx

@@ -2,10 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { LargeButton } from '_app/shared/LargeButton';
-import { useGetDelegatedStake } from '_app/staking/useGetDelegatedStake';
 import { ampli } from '_src/shared/analytics/ampli';
 import { Text } from '_src/ui/app/shared/text';
-import { useFormatCoin } from '@mysten/core';
+import { useFormatCoin, useGetDelegatedStake } from '@mysten/core';
 import { WalletActionStake24 } from '@mysten/icons';
 import { SUI_TYPE_ARG } from '@mysten/sui.js/utils';
 import { useMemo } from 'react';
@@ -17,7 +16,9 @@ export function TokenIconLink({
 	accountAddress: string;
 	disabled: boolean;
 }) {
-	const { data: delegatedStake, isLoading } = useGetDelegatedStake(accountAddress);
+	const { data: delegatedStake, isLoading } = useGetDelegatedStake(accountAddress, {
+		autoRefetch: true,
+	});
 
 	// Total active stake for all delegations
 	const totalActivePendingStake = useMemo(() => {
@@ -44,6 +45,7 @@ export function TokenIconLink({
 			}}
 			loading={isLoading || queryResult.isLoading}
 			before={<WalletActionStake24 />}
+			data-testId={`stake-button-${formatted}-${symbol}`}
 		>
 			<div className="flex flex-col">
 				<Text variant="pBody" weight="semibold">

apps/wallet/src/ui/app/staking/delegation-detail/DelegationDetailCard.tsx

@@ -14,7 +14,7 @@ import { ampli } from '_src/shared/analytics/ampli';
 import { API_ENV } from '_src/shared/api-env';
 import { MIN_NUMBER_SUI_TO_STAKE } from '_src/shared/constants';
 import FaucetRequestButton from '_src/ui/app/shared/faucet/FaucetRequestButton';
-import { useCoinMetadata, useGetValidatorsApy } from '@mysten/core';
+import { useCoinMetadata, useGetDelegatedStake, useGetValidatorsApy } from '@mysten/core';
 import { useSuiClientQuery } from '@mysten/dapp-kit';
 import { ArrowLeft16, StakeAdd16, StakeRemove16 } from '@mysten/icons';
 import type { StakeObject } from '@mysten/sui.js/client';
@@ -26,7 +26,6 @@ import { useActiveAddress } from '../../hooks/useActiveAddress';
 import { Heading } from '../../shared/heading';
 import { getDelegationDataByStakeId } from '../getDelegationByStakeId';
 import { StakeAmount } from '../home/StakeAmount';
-import { useGetDelegatedStake } from '../useGetDelegatedStake';
 
 type DelegationDetailCardProps = {
 	validatorAddress: string;
@@ -42,7 +41,13 @@ export function DelegationDetailCard({ validatorAddress, stakedId }: DelegationD
 
 	const accountAddress = useActiveAddress();
 
-	const { data: allDelegation, isLoading, isError } = useGetDelegatedStake(accountAddress || '');
+	const {
+		data: allDelegation,
+		isLoading,
+		isError,
+	} = useGetDelegatedStake(accountAddress || '', {
+		autoRefetch: true,
+	});
 
 	const apiEnv = useAppSelector(({ app }) => app.apiEnv);
 	const { staleTime, refetchInterval } = useCoinsReFetchingConfig();

apps/wallet/src/ui/app/staking/delegation-detail/index.tsx

@@ -3,11 +3,11 @@
 
 import LoadingIndicator from '_components/loading/LoadingIndicator';
 import Overlay from '_components/overlay';
+import { useGetDelegatedStake } from '@mysten/core';
 import { Navigate, useNavigate, useSearchParams } from 'react-router-dom';
 
 import { useActiveAddress } from '../../hooks/useActiveAddress';
 import { getDelegationDataByStakeId } from '../getDelegationByStakeId';
-import { useGetDelegatedStake } from '../useGetDelegatedStake';
 import { ValidatorLogo } from '../validators/ValidatorLogo';
 import { DelegationDetailCard } from './DelegationDetailCard';
 

apps/wallet/src/ui/app/staking/stake/StakingCard.tsx

@@ -13,7 +13,7 @@ import { ampli } from '_src/shared/analytics/ampli';
 import { MIN_NUMBER_SUI_TO_STAKE } from '_src/shared/constants';
 import { FEATURES } from '_src/shared/experimentation/features';
 import { useFeatureIsOn } from '@growthbook/growthbook-react';
-import { useCoinMetadata } from '@mysten/core';
+import { useCoinMetadata, useGetDelegatedStake } from '@mysten/core';
 import { useSuiClientQuery } from '@mysten/dapp-kit';
 import { ArrowLeft16 } from '@mysten/icons';
 import type { StakeObject } from '@mysten/sui.js/client';
@@ -34,7 +34,6 @@ import { useSigner } from '../../hooks/useSigner';
 import { QredoActionIgnoredByUser } from '../../QredoSigner';
 import { getDelegationDataByStakeId } from '../getDelegationByStakeId';
 import { getStakeSuiBySuiId } from '../getStakeSuiBySuiId';
-import { useGetDelegatedStake } from '../useGetDelegatedStake';
 import StakeForm from './StakeForm';
 import { UnStakeForm } from './UnstakeForm';
 import { createStakeTransaction, createUnstakeTransaction } from './utils/transaction';
@@ -62,7 +61,9 @@ function StakingCard() {
 	const validatorAddress = searchParams.get('address');
 	const stakeSuiIdParams = searchParams.get('staked');
 	const unstake = searchParams.get('unstake') === 'true';
-	const { data: allDelegation, isLoading } = useGetDelegatedStake(accountAddress || '');
+	const { data: allDelegation, isLoading } = useGetDelegatedStake(accountAddress || '', {
+		autoRefetch: true,
+	});
 	const effectsOnlySharedTransactions = useFeatureIsOn(
 		FEATURES.WALLET_EFFECTS_ONLY_SHARED_TRANSACTION as string,
 	);
@@ -222,7 +223,7 @@ function StakingCard() {
 						queryKey: ['system', 'state'],
 					}),
 					queryClient.invalidateQueries({
-						queryKey: ['validator'],
+						queryKey: ['delegated-stakes'],
 					}),
 				]);
 				resetForm();

apps/wallet/src/ui/app/staking/stake/ValidatorFormDetail.tsx

@@ -6,7 +6,12 @@ import Alert from '_components/alert';
 import LoadingIndicator from '_components/loading/LoadingIndicator';
 import { Text } from '_src/ui/app/shared/text';
 import { IconTooltip } from '_src/ui/app/shared/tooltip';
-import { calculateStakeShare, formatPercentageDisplay, useGetValidatorsApy } from '@mysten/core';
+import {
+	calculateStakeShare,
+	formatPercentageDisplay,
+	useGetDelegatedStake,
+	useGetValidatorsApy,
+} from '@mysten/core';
 import { useSuiClientQuery } from '@mysten/dapp-kit';
 import { useMemo } from 'react';
 import { useSearchParams } from 'react-router-dom';
@@ -15,7 +20,6 @@ import { useActiveAddress } from '../../hooks/useActiveAddress';
 import { getStakeSuiBySuiId } from '../getStakeSuiBySuiId';
 import { getTokenStakeSuiForValidator } from '../getTokenStakeSuiForValidator';
 import { StakeAmount } from '../home/StakeAmount';
-import { useGetDelegatedStake } from '../useGetDelegatedStake';
 import { ValidatorLogo } from '../validators/ValidatorLogo';
 
 type ValidatorFormDetailProps = {
@@ -34,7 +38,14 @@ export function ValidatorFormDetail({ validatorAddress, unstake }: ValidatorForm
 		isError: errorValidators,
 	} = useSuiClientQuery('getLatestSuiSystemState');
 
-	const { data: stakeData, isLoading, isError, error } = useGetDelegatedStake(accountAddress || '');
+	const {
+		data: stakeData,
+		isLoading,
+		isError,
+		error,
+	} = useGetDelegatedStake(accountAddress || '', {
+		autoRefetch: true,
+	});
 
 	const { data: rollingAverageApys } = useGetValidatorsApy();
 

apps/wallet/src/ui/app/staking/validators/ValidatorsCard.tsx

@@ -8,6 +8,7 @@ import { Text } from '_app/shared/text';
 import Alert from '_components/alert';
 import LoadingIndicator from '_components/loading/LoadingIndicator';
 import { ampli } from '_src/shared/analytics/ampli';
+import { useGetDelegatedStake } from '@mysten/core';
 import { useSuiClientQuery } from '@mysten/dapp-kit';
 import { Plus12 } from '@mysten/icons';
 import type { StakeObject } from '@mysten/sui.js/client';
@@ -17,7 +18,6 @@ import { useActiveAddress } from '../../hooks/useActiveAddress';
 import { getAllStakeSui } from '../getAllStakeSui';
 import { StakeAmount } from '../home/StakeAmount';
 import { StakeCard, type DelegationObjectWithValidator } from '../home/StakedCard';
-import { useGetDelegatedStake } from '../useGetDelegatedStake';
 
 export function ValidatorsCard() {
 	const accountAddress = useActiveAddress();
@@ -26,7 +26,9 @@ export function ValidatorsCard() {
 		isLoading,
 		isError,
 		error,
-	} = useGetDelegatedStake(accountAddress || '');
+	} = useGetDelegatedStake(accountAddress || '', {
+		autoRefetch: true,
+	});
 
 	const { data: system } = useSuiClientQuery('getLatestSuiSystemState');
 	const activeValidators = system?.activeValidators;

apps/wallet/src/ui/app/staking/validators/index.tsx

@@ -4,10 +4,10 @@
 import Alert from '_components/alert';
 import Loading from '_components/loading';
 import Overlay from '_components/overlay';
+import { useGetDelegatedStake } from '@mysten/core';
 import { useNavigate } from 'react-router-dom';
 
 import { useActiveAddress } from '../../hooks/useActiveAddress';
-import { useGetDelegatedStake } from '../useGetDelegatedStake';
 import { SelectValidatorCard } from './SelectValidatorCard';
 import { ValidatorsCard } from './ValidatorsCard';
 
@@ -18,7 +18,9 @@ export function Validators() {
 		isLoading,
 		isError,
 		error,
-	} = useGetDelegatedStake(accountAddress || '');
+	} = useGetDelegatedStake(accountAddress || '', {
+		autoRefetch: true,
+	});
 
 	const navigate = useNavigate();