Merge pull request #82 from dappforce/fix-balances

Fix balances in balances table

src/components/identity/types.tsx

@@ -18,15 +18,22 @@ export type Info = {
 
 export type InfoKeys = keyof Info
 
-export const identityInfoKeys: InfoKeys[] = [ 'display', 'legal', 'web', 'riot', 'email', 'twitter' ]
+export const identityInfoKeys: InfoKeys[] = [
+  'display',
+  'legal',
+  'web',
+  'riot',
+  'email',
+  'twitter',
+]
 
 export type AccountInfoByChain = {
   accountId: string
   totalBalance: string
-  freeBalance: string
-  frozenFee: string
   reservedBalance: string
-  frozenMisc: string
+  frozenBalance: string
+  freeBalance: string
+  lockedBalance: string
 }
 
 export type AccountInfoItem = {
@@ -41,7 +48,10 @@ export type CrowdloansContributions = {
   contribution: string
 }
 
-export type CrowdloansContributionsByParaId = Record<string, CrowdloansContributions>
+export type CrowdloansContributionsByParaId = Record<
+  string,
+  CrowdloansContributions
+>
 
 export type CrowdloanInfo = {
   depositor?: string
@@ -79,4 +89,4 @@ export type SubsocialProfile = {
   experimental: Record<string, string>
 }
 
-export type AccountIdentities = Record<string, SubsocialProfile | Identity>
+export type AccountIdentities = Record<string, SubsocialProfile | Identity>

src/components/table/balancesTable/parseBalanceInfo.tsx

@@ -40,22 +40,18 @@ import { FiSend } from 'react-icons/fi'
 import { LinksButton } from '../links/Links'
 
 const getAccountData = (info: AccountInfoByChain, t: TFunction) => {
-  const { reservedBalance, frozenFee, freeBalance, frozenMisc } = info
-
-  const transferableBalance = new BN(freeBalance || 0)
-    .minus(new BN(frozenMisc || frozenFee || 0))
-    .toString()
+  const { reservedBalance, frozenBalance, freeBalance, lockedBalance } = info
 
   return [
     {
       key: 'frozen',
       label: t('table.balances.frozen'),
-      value: frozenFee?.toString() || '0',
+      value: frozenBalance?.toString() || '0',
     },
     {
       key: 'locked',
       label: t('table.balances.locked'),
-      value: frozenMisc?.toString() || '0',
+      value: lockedBalance?.toString() || '0',
     },
     {
       key: 'reserved',
@@ -65,7 +61,7 @@ const getAccountData = (info: AccountInfoByChain, t: TFunction) => {
     {
       key: 'free',
       label: t('table.balances.free'),
-      value: transferableBalance,
+      value: freeBalance,
     },
   ]
 }

src/i18n/en.json

@@ -343,7 +343,7 @@
   },
   "table": {
     "balances": {
-      "frozen": "Frozen fee",
+      "frozen": "Frozen",
       "locked": "Locked balance",
       "reserved": "Reserved balance",
       "free": "Transferable",

src/utils/balance.ts

@@ -2,8 +2,10 @@ import BN from 'bn.js'
 import { BN_ZERO } from '@polkadot/util'
 import { AccountInfoByChain } from 'src/components/identity/types'
 
-export const getTransferableBalance = (data: AccountInfoByChain | undefined) => {
+export const getTransferableBalance = (
+  data: AccountInfoByChain | undefined
+) => {
   if (!data) return BN_ZERO
-  const { freeBalance, frozenMisc, frozenFee } = data
-  return new BN(freeBalance).sub(new BN(frozenMisc || frozenFee || BN_ZERO))
+  const { freeBalance } = data
+  return new BN(freeBalance)
 }