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

iotaledger · Jan 3, 2025 · f75af1c · f75af1c
2 parents 682f220 + 329fe38
commit f75af1c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 10 deletions.
diff --git a/apps/wallet-dashboard/app/(protected)/vesting/page.tsx b/apps/wallet-dashboard/app/(protected)/vesting/page.tsx
@@ -33,6 +33,8 @@ import {
     Button,
     ButtonType,
     LoadingIndicator,
+    LabelText,
+    LabelTextSize,
 } from '@iota/apps-ui-kit';
 import {
     Theme,
@@ -150,6 +152,11 @@ export default function VestingDashboardPage(): JSX.Element {
         IOTA_TYPE_ARG,
     );
 
+    const [formattedAvailableStaking, availableStakingSymbol] = useFormatCoin(
+        supplyIncreaseVestingSchedule.availableStaking,
+        IOTA_TYPE_ARG,
+    );
+
     function handleOnSuccess(digest: string): void {
         setTimelockedObjectsToUnstake(null);
 
@@ -221,7 +228,7 @@ export default function VestingDashboardPage(): JSX.Element {
                     <Panel>
                         <Title title="Vesting" size={TitleSize.Medium} />
                         <div className="flex flex-col gap-md p-lg pt-sm">
-                            <div className="flex h-24 flex-row gap-4">
+                            <div className="flex h-24 flex-row gap-md">
                                 <DisplayStats
                                     label="Total Vested"
                                     value={formattedTotalVested}
@@ -320,8 +327,8 @@ export default function VestingDashboardPage(): JSX.Element {
                                 }
                             />
 
-                            <div className="flex flex-col px-lg py-sm">
-                                <div className="flex flex-row gap-md">
+                            <div className="flex flex-col gap-y-md px-lg py-sm">
+                                <div className="flex flex-row gap-x-md">
                                     <DisplayStats
                                         label="Your stake"
                                         value={`${totalStakedFormatted} ${totalStakedSymbol}`}
@@ -331,6 +338,21 @@ export default function VestingDashboardPage(): JSX.Element {
                                         value={`${totalEarnedFormatted} ${totalEarnedSymbol}`}
                                     />
                                 </div>
+                                <div className="flex w-full">
+                                    <Card type={CardType.Filled}>
+                                        <CardBody
+                                            title=""
+                                            subtitle={
+                                                <LabelText
+                                                    size={LabelTextSize.Large}
+                                                    label="Available for staking"
+                                                    text={formattedAvailableStaking}
+                                                    supportingLabel={availableStakingSymbol}
+                                                />
+                                            }
+                                        />
+                                    </Card>
+                                </div>
                             </div>
                             <div className="flex flex-col px-lg py-sm">
                                 <div className="flex w-full flex-col items-center justify-center space-y-4 pt-4">

diff --git a/apps/wallet/src/ui/app/components/iota-apps/DisconnectApp.tsx b/apps/wallet/src/ui/app/components/iota-apps/DisconnectApp.tsx
@@ -72,12 +72,7 @@ function DisconnectApp({
         return null;
     }
     return (
-        <Overlay
-            showBackButton
-            showModal
-            setShowModal={setShowDisconnectApp}
-            title="Active Connection"
-        >
+        <Overlay showModal setShowModal={setShowDisconnectApp} title="Active Connection">
             <div className="flex max-w-full flex-1 flex-col flex-nowrap items-stretch gap-y-md">
                 <DAppInfoCard name={name} iconUrl={icon} url={link} />
 

diff --git a/apps/wallet/src/ui/app/pages/home/receipt/index.tsx b/apps/wallet/src/ui/app/pages/home/receipt/index.tsx
@@ -64,7 +64,6 @@ function ReceiptPage() {
                 title={pageTitle}
                 closeOverlay={closeReceipt}
                 closeIcon={<Checkmark fill="currentColor" className="text-iota-light h-8 w-8" />}
-                showBackButton
             >
                 {isError ? (
                     <div className="mb-2 flex h-full w-full items-center justify-center p-2">