Clean up baker version type predicate

Concordium · Oct 27, 2023 · 7a10da3 · 7a10da3
1 parent 2a29a76
commit 7a10da3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/packages/browser-wallet/src/popup/pages/Account/Earn/Baking/Baking.tsx b/packages/browser-wallet/src/popup/pages/Account/Earn/Baking/Baking.tsx
@@ -3,9 +3,6 @@ import React, { useContext, useEffect, useMemo } from 'react';
 import { Link, Route, Routes, useNavigate } from 'react-router-dom';
 import {
     AccountBakerDetailsV1,
-    AccountInfo,
-    AccountInfoBaker,
-    AccountInfoType,
     AccountTransactionType,
     ConsensusStatus,
     StakePendingChange,
@@ -34,6 +31,7 @@ import RegisterBaking from './RegisterBaking';
 import RemoveBaking from './RemoveBaking';
 import UpdateBaking from './UpdateBaking';
 import { earnPageContext } from '../utils';
+import { isBakerAccountV1 } from './utils';
 
 const routes = {
     register: 'register',
@@ -107,9 +105,6 @@ function DisplayPendingChange({ pendingChange }: DisplayPendingChangeProps) {
     );
 }
 
-const isBakerAccountV1 = (accountInfo: AccountInfo): accountInfo is AccountInfoBaker =>
-    accountInfo.type === AccountInfoType.Baker && accountInfo.accountBaker.version === 1;
-
 type BakingDetailsProps = {
     bakerDetails: AccountBakerDetailsV1;
 };
@@ -187,7 +182,7 @@ function BakingStatus() {
         }
     }, []);
 
-    if (isBakerAccountV1(accountInfo) && accountInfo.accountBaker.version === 1) {
+    if (isBakerAccountV1(accountInfo)) {
         return <BakingDetails bakerDetails={accountInfo.accountBaker} />;
     }
     if (hasUpdate && transaction) {

diff --git a/packages/browser-wallet/src/popup/pages/Account/Earn/Baking/utils.ts b/packages/browser-wallet/src/popup/pages/Account/Earn/Baking/utils.ts
@@ -7,6 +7,8 @@ import {
     OpenStatusText,
     BakerKeysWithProofs,
     AccountInfoType,
+    AccountInfoBaker,
+    AccountBakerDetailsV1,
 } from '@concordium/web-sdk';
 import { decimalToRewardFraction, fractionToPercentage } from '@popup/shared/utils/baking-helpers';
 import { getConfigureBakerEnergyCost } from '@shared/utils/energy-helpers';
@@ -167,3 +169,10 @@ export function getCost(accountInfo: AccountInfo, formValues: Partial<ConfigureB
 
     return getConfigureBakerEnergyCost(toPayload(getConfigureBakerChanges(formValuesFull, accountInfo)));
 }
+
+export interface AccountInfoBakerV1 extends AccountInfoBaker {
+    accountBaker: AccountBakerDetailsV1;
+}
+
+export const isBakerAccountV1 = (accountInfo: AccountInfo): accountInfo is AccountInfoBakerV1 =>
+    accountInfo.type === AccountInfoType.Baker && accountInfo.accountBaker.version === 1;