code refactor

darwinia-network · Dec 29, 2022 · d48e0e9 · d48e0e9
1 parent 6456732
commit d48e0e9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/packages/app-types/src/staking.ts b/packages/app-types/src/staking.ts
@@ -91,4 +91,25 @@ export interface Deposit {
   canEarlyWithdraw: boolean;
   isEarlyWithdrawn: boolean;
 }
+
+export interface Bond {
+  amount: BigNumber;
+  symbol: string;
+  isDeposit: boolean;
+}
+
+export interface Delegate {
+  id: string;
+  collator?: string;
+  previousReward?: string;
+  staked: BigNumber;
+  bondedTokens: Bond[];
+  isActive?: boolean;
+  isMigrated?: boolean;
+  isLoading?: boolean;
+  isUndelegating?: boolean;
+  canUndelegate?: boolean;
+  canChangeCollator?: boolean;
+}
+
 /*Staking types end here*/
diff --git a/packages/app/src/components/StakingOverview/index.tsx b/packages/app/src/components/StakingOverview/index.tsx
@@ -110,7 +110,7 @@ const StakingOverview = () => {
     const totalSelectedRing = allSelectedItems.reduce((acc, deposit) => acc.plus(deposit.value), BigNumber(0));
     const power = calculateExtraPower({
       kton: BigNumber(0),
-      ring: BigNumber(formatToWei(totalSelectedRing.toString()).toString()),
+      ring: BigNumber(totalSelectedRing.toString()),
     });
     setPowerByDeposits(power);
     setDepositsToStake(allSelectedItems);

diff --git a/packages/app/src/components/StakingRecordsTable/index.tsx b/packages/app/src/components/StakingRecordsTable/index.tsx
@@ -19,29 +19,10 @@ import minusIcon from "../../assets/images/minus-square.svg";
 import helpIcon from "../../assets/images/help.svg";
 import reloadIcon from "../../assets/images/reload.svg";
 import { ChangeEvent, useEffect, useRef, useState } from "react";
-import { Deposit } from "@darwinia/app-types";
+import { Deposit, Delegate } from "@darwinia/app-types";
 import { formatToWei, isValidNumber, prettifyNumber } from "@darwinia/app-utils";
 import BigNumber from "bignumber.js";
 
-interface Bond {
-  amount: BigNumber;
-  symbol: string;
-  isDeposit: boolean;
-}
-
-interface Delegate extends TableRow {
-  collator?: string;
-  previousReward?: string;
-  staked: BigNumber;
-  bondedTokens: Bond[];
-  isActive?: boolean;
-  isMigrated?: boolean;
-  isLoading?: boolean;
-  isUndelegating?: boolean;
-  canUndelegate?: boolean;
-  canChangeCollator?: boolean;
-}
-
 const StakingRecordsTable = () => {
   const { t } = useAppTranslation();
   const { selectedNetwork } = useWallet();