Merge branch 'develop' into devx/constants-file-for-urls

iotaledger · Dec 12, 2024 · c8af992 · c8af992
2 parents 8567e65 + 9b5f33f
commit c8af992
Show file tree

Hide file tree

Showing 49 changed files with 2,615 additions and 972 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -46,10 +46,10 @@ jobs:
       matrix:
         os: [
           self-hosted, # ubuntu-x86_64
+          # TODO: uncomment when runners are public available https://github.com/iotaledger/iota/issues/4421
+          # ubuntu-arm64, # ubuntu-arm64
           macos-latest, # macos-arm64
-          # windows-latest (windows-x86_64) is disabled because we need to add custom logic for authenticating
-          # git for private repositories during the build (needed for iota-msim)
-          # MrSquaare/ssh-setup-action@v3 does not support windows
+          windows-latest, # windows-x86_64
         ]
       fail-fast: false
     runs-on: ${{ matrix.os }}
@@ -108,10 +108,10 @@ jobs:
         if: ${{ matrix.os == 'windows-latest' }}
         shell: bash
         run: |
-          choco install postgresql12 --force --params '/Password:root'
-          echo "C:\Program Files\PostgreSQL\12\bin" >> $GITHUB_PATH
-          echo "C:\Program Files\PostgreSQL\12\lib" >> $GITHUB_PATH
-          echo "PQ_LIB_DIR=C:\Program Files\PostgreSQL\12\lib" >> $GITHUB_ENV
+          choco install postgresql16 --force --params '/Password:root'
+          echo "C:\Program Files\PostgreSQL\16\bin" >> $GITHUB_PATH
+          echo "C:\Program Files\PostgreSQL\16\lib" >> $GITHUB_PATH
+          echo "PQ_LIB_DIR=C:\Program Files\PostgreSQL\16\lib" >> $GITHUB_ENV
           echo "PG_DATABASE_URL=postgres://postgres:root@localhost/" >> $GITHUB_ENV
           echo "PG_EXAMPLE_DATABASE_URL=postgres://postgres:root@localhost/diesel_example" >> $GITHUB_ENV
 
@@ -126,6 +126,7 @@ jobs:
         run: |
           brew install postgresql
 
+      # TODO: uncomment when runners are public available https://github.com/iotaledger/iota/issues/4421
       #  NOTE: Self-hosted runners should already have postgres installed
       #      - name: Install postgres (Ubuntu arm64)
       #        if: ${{ matrix.os == 'ubuntu-arm64' }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/core/src/components/stake/StakedCard.tsx b/apps/core/src/components/stake/StakedCard.tsx
@@ -7,27 +7,10 @@ import { Card, CardImage, CardType, CardBody, CardAction, CardActionType } from
 import { useMemo } from 'react';
 import { useIotaClientQuery } from '@iota/dapp-kit';
 import { ImageIcon } from '../icon';
-import { determineCountDownText, ExtendedDelegatedStake } from '../../utils';
-import { TimeUnit, useFormatCoin, useGetTimeBeforeEpochNumber, useTimeAgo } from '../../hooks';
-import { NUM_OF_EPOCH_BEFORE_STAKING_REWARDS_REDEEMABLE } from '../../constants';
+import { ExtendedDelegatedStake } from '../../utils';
+import { useFormatCoin, useStakeRewardStatus } from '../../hooks';
 import React from 'react';
 
-export enum StakeState {
-    WarmUp = 'WARM_UP',
-    Earning = 'EARNING',
-    CoolDown = 'COOL_DOWN',
-    Withdraw = 'WITHDRAW',
-    InActive = 'IN_ACTIVE',
-}
-
-const STATUS_COPY: { [key in StakeState]: string } = {
-    [StakeState.WarmUp]: 'Starts Earning',
-    [StakeState.Earning]: 'Staking Rewards',
-    [StakeState.CoolDown]: 'Available to withdraw',
-    [StakeState.Withdraw]: 'Withdraw',
-    [StakeState.InActive]: 'Inactive',
-};
-
 interface StakedCardProps {
     extendedStake: ExtendedDelegatedStake;
     currentEpoch: number;
@@ -45,48 +28,20 @@ export function StakedCard({
 }: StakedCardProps) {
     const { principal, stakeRequestEpoch, estimatedReward, validatorAddress } = extendedStake;
 
-    // TODO: Once two step withdraw is available, add cool down and withdraw now logic
-    // For cool down epoch, show Available to withdraw add rewards to principal
-    // Reward earning epoch is 2 epochs after stake request epoch
-    const earningRewardsEpoch =
-        Number(stakeRequestEpoch) + NUM_OF_EPOCH_BEFORE_STAKING_REWARDS_REDEEMABLE;
-    const isEarnedRewards = currentEpoch >= Number(earningRewardsEpoch);
-    const delegationState = inactiveValidator
-        ? StakeState.InActive
-        : isEarnedRewards
-          ? StakeState.Earning
-          : StakeState.WarmUp;
-
-    const rewards = isEarnedRewards && estimatedReward ? BigInt(estimatedReward) : 0n;
+    const { rewards, title, subtitle } = useStakeRewardStatus({
+        stakeRequestEpoch,
+        currentEpoch,
+        estimatedReward,
+        inactiveValidator,
+    });
 
     // For inactive validator, show principal + rewards
     const [principalStaked, symbol] = useFormatCoin(
         inactiveValidator ? principal + rewards : principal,
         IOTA_TYPE_ARG,
     );
-    const [rewardsStaked] = useFormatCoin(rewards, IOTA_TYPE_ARG);
-
-    // Applicable only for warm up
-    const epochBeforeRewards = delegationState === StakeState.WarmUp ? earningRewardsEpoch : null;
-
-    const statusText = {
-        // Epoch time before earning
-        [StakeState.WarmUp]: `Epoch #${earningRewardsEpoch}`,
-        [StakeState.Earning]: `${rewardsStaked} ${symbol}`,
-        // Epoch time before redrawing
-        [StakeState.CoolDown]: `Epoch #`,
-        [StakeState.Withdraw]: 'Now',
-        [StakeState.InActive]: 'Not earning rewards',
-    };
 
     const { data } = useIotaClientQuery('getLatestIotaSystemState');
-    const { data: rewardEpochTime } = useGetTimeBeforeEpochNumber(Number(epochBeforeRewards) || 0);
-    const timeAgo = useTimeAgo({
-        timeFrom: rewardEpochTime || null,
-        shortedTimeLabel: false,
-        shouldEnd: true,
-        maxTimeUnit: TimeUnit.ONE_HOUR,
-    });
 
     const validatorMeta = useMemo(() => {
         if (!data) return null;
@@ -97,17 +52,6 @@ export function StakedCard({
         );
     }, [validatorAddress, data]);
 
-    const rewardTime = () => {
-        if (Number(epochBeforeRewards) && rewardEpochTime > 0) {
-            return determineCountDownText({
-                timeAgo,
-                label: 'in',
-            });
-        }
-
-        return statusText[delegationState];
-    };
-
     return (
         <Card testId="staked-card" type={CardType.Default} isHoverable onClick={onClick}>
             <CardImage>
@@ -118,11 +62,7 @@ export function StakedCard({
                 />
             </CardImage>
             <CardBody title={validatorMeta?.name || ''} subtitle={`${principalStaked} ${symbol}`} />
-            <CardAction
-                title={rewardTime()}
-                subtitle={STATUS_COPY[delegationState]}
-                type={CardActionType.SupportingText}
-            />
+            <CardAction title={title} subtitle={subtitle} type={CardActionType.SupportingText} />
         </Card>
     );
 }
diff --git a/apps/core/src/hooks/index.ts b/apps/core/src/hooks/index.ts
@@ -46,5 +46,6 @@ export * from './useNFTBasicData';
 export * from './useOwnedNFT';
 export * from './useNftDetails';
 export * from './useCountdownByTimestamp';
+export * from './useStakeRewardStatus';
 
 export * from './stake';
diff --git a/apps/core/src/hooks/useStakeRewardStatus.ts b/apps/core/src/hooks/useStakeRewardStatus.ts
@@ -0,0 +1,92 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
+import { NUM_OF_EPOCH_BEFORE_STAKING_REWARDS_REDEEMABLE } from '../constants';
+import { useFormatCoin, useGetTimeBeforeEpochNumber, useTimeAgo, TimeUnit } from '.';
+import { determineCountDownText } from '../utils';
+
+export function useStakeRewardStatus({
+    stakeRequestEpoch,
+    currentEpoch,
+    inactiveValidator,
+    estimatedReward,
+}: {
+    stakeRequestEpoch: string;
+    currentEpoch: number;
+    inactiveValidator: boolean;
+    estimatedReward?: string | number | bigint;
+}) {
+    // TODO: Once two step withdraw is available, add cool down and withdraw now logic
+    // For cool down epoch, show Available to withdraw add rewards to principal
+    // Reward earning epoch is 2 epochs after stake request epoch
+    const earningRewardsEpoch =
+        Number(stakeRequestEpoch) + NUM_OF_EPOCH_BEFORE_STAKING_REWARDS_REDEEMABLE;
+
+    const isEarnedRewards = currentEpoch >= Number(earningRewardsEpoch);
+
+    const delegationState = inactiveValidator
+        ? StakeState.InActive
+        : isEarnedRewards
+          ? StakeState.Earning
+          : StakeState.WarmUp;
+
+    const rewards = isEarnedRewards && estimatedReward ? BigInt(estimatedReward) : 0n;
+
+    const [rewardsStaked, symbol] = useFormatCoin(rewards, IOTA_TYPE_ARG);
+
+    // Applicable only for warm up
+    const epochBeforeRewards = delegationState === StakeState.WarmUp ? earningRewardsEpoch : null;
+
+    const statusText = {
+        // Epoch time before earning
+        [StakeState.WarmUp]: `Epoch #${earningRewardsEpoch}`,
+        [StakeState.Earning]: `${rewardsStaked} ${symbol}`,
+        // Epoch time before redrawing
+        [StakeState.CoolDown]: `Epoch #`,
+        [StakeState.Withdraw]: 'Now',
+        [StakeState.InActive]: 'Not earning rewards',
+    };
+
+    const { data: rewardEpochTime } = useGetTimeBeforeEpochNumber(Number(epochBeforeRewards) || 0);
+
+    const timeAgo = useTimeAgo({
+        timeFrom: rewardEpochTime || null,
+        shortedTimeLabel: false,
+        shouldEnd: true,
+        maxTimeUnit: TimeUnit.ONE_HOUR,
+    });
+
+    const rewardTime = () => {
+        if (Number(epochBeforeRewards) && rewardEpochTime > 0) {
+            return determineCountDownText({
+                timeAgo,
+                label: 'in',
+            });
+        }
+
+        return statusText[delegationState];
+    };
+
+    return {
+        rewards,
+        title: rewardTime(),
+        subtitle: STATUS_COPY[delegationState],
+    };
+}
+export enum StakeState {
+    WarmUp = 'WARM_UP',
+    Earning = 'EARNING',
+    CoolDown = 'COOL_DOWN',
+    Withdraw = 'WITHDRAW',
+    InActive = 'IN_ACTIVE',
+}
+export const STATUS_COPY: {
+    [key in StakeState]: string;
+} = {
+    [StakeState.WarmUp]: 'Starts Earning',
+    [StakeState.Earning]: 'Staking Rewards',
+    [StakeState.CoolDown]: 'Available to withdraw',
+    [StakeState.Withdraw]: 'Withdraw',
+    [StakeState.InActive]: 'Inactive',
+};
diff --git a/apps/wallet-dashboard/app/(protected)/layout.tsx b/apps/wallet-dashboard/app/(protected)/layout.tsx
@@ -25,11 +25,14 @@ function DashboardLayout({ children }: PropsWithChildren): JSX.Element {
                 <Sidebar />
             </div>
 
-            <div className="container relative flex min-h-screen flex-col">
-                <div className="sticky top-0 z-10 backdrop-blur-lg">
-                    <TopNav />
+            {/* This padding need to have aligned left/right content's position, because of sidebar overlap on the small screens */}
+            <div className="pl-[72px]">
+                <div className="container relative flex min-h-screen flex-col">
+                    <div className="sticky top-0 z-10 backdrop-blur-lg">
+                        <TopNav />
+                    </div>
+                    <div className="flex-1 py-md--rs">{children}</div>
                 </div>
-                <div className="flex-1 py-md--rs">{children}</div>
             </div>
 
             <div className="fixed bottom-5 right-5">