fixed amount calculation

Emurgo · Jan 30, 2024 · d5e8842 · d5e8842
1 parent 3f0da33
commit d5e8842
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 34 deletions.
diff --git a/packages/yoroi-extension/app/api/common/lib/MultiToken.js b/packages/yoroi-extension/app/api/common/lib/MultiToken.js
@@ -26,6 +26,16 @@ export class MultiToken {
   values: Array<TokenEntry>;
   defaults: DefaultTokenEntry;
 
+  /**
+   * If both passed tokens are not null - they are added.
+   * If either is null - the one not null is returned.
+   * If both is null - null is returned.
+   */
+  static sumOrEitherNotNull(token1: ?MultiToken, token2: ?MultiToken): ?MultiToken {
+    if (token1 == null || token2 == null) return token1 ?? token2;
+    return token1.joinAddCopy(token2);
+  }
+
   static from(multiTokenData: {|
     values: Array<{| identifier: string, networkId: number, amount: string |}>,
     defaults: DefaultTokenEntry,

diff --git a/packages/yoroi-extension/app/components/common/AmountDisplay.js b/packages/yoroi-extension/app/components/common/AmountDisplay.js
@@ -17,7 +17,7 @@ type Props = {|
   +showFiat?: boolean,
   +shouldHideBalance: boolean,
   +getTokenInfo: ($ReadOnly<Inexact<TokenLookupKey>>) => $ReadOnly<TokenRow>,
-  +amount: null | MultiToken,
+  +amount: ?MultiToken,
   +unitOfAccountSetting: UnitOfAccountSettingType,
   +getCurrentPrice: (from: string, to: string) => ?string,
 |};

diff --git a/packages/yoroi-extension/app/components/topbar/NavWalletDetails.js b/packages/yoroi-extension/app/components/topbar/NavWalletDetails.js
@@ -167,14 +167,8 @@ export default class NavWalletDetails extends Component<Props> {
     );
   }
 
-  getTotalAmount: void => (null | MultiToken) = () => {
-    if (this.props.rewards === undefined) {
-      return this.props.walletAmount;
-    }
-    if (this.props.rewards === null || this.props.walletAmount === null) {
-      return null;
-    }
-    return this.props.walletAmount.joinAddCopy(this.props.rewards);
+  getTotalAmount: void => ?MultiToken = () => {
+    return MultiToken.sumOrEitherNotNull(this.props.walletAmount, this.props.rewards);
   }
 
   renderAmountDisplay: {|

diff --git a/packages/yoroi-extension/app/components/topbar/NavWalletDetailsRevamp.js b/packages/yoroi-extension/app/components/topbar/NavWalletDetailsRevamp.js
@@ -163,13 +163,7 @@ export default class NavWalletDetailsRevamp extends Component<Props> {
     );
   }
 
-  getTotalAmount: void => null | MultiToken = () => {
-    if (this.props.rewards == null) {
-      return this.props.walletAmount;
-    }
-    if (this.props.walletAmount == null) {
-      return this.props.rewards;
-    }
-    return this.props.rewards.joinAddCopy(this.props.walletAmount);
+  getTotalAmount: void => ?MultiToken = () => {
+    return MultiToken.sumOrEitherNotNull(this.props.walletAmount, this.props.rewards)
   };
 }
diff --git a/packages/yoroi-extension/app/components/topbar/WalletCard.js b/packages/yoroi-extension/app/components/topbar/WalletCard.js
@@ -1,23 +1,20 @@
 // @flow
-import { Component } from 'react';
 import type { Node } from 'react';
+import { Component } from 'react';
 import { observer } from 'mobx-react';
-import { intlShape, defineMessages } from 'react-intl';
+import type { $npm$ReactIntl$IntlFormat, $npm$ReactIntl$MessageDescriptor } from 'react-intl';
+import { defineMessages, intlShape } from 'react-intl';
 import styles from './WalletCard.scss';
 import WalletAccountIcon from './WalletAccountIcon';
+import type { TokenLookupKey } from '../../api/common/lib/MultiToken';
 import { MultiToken } from '../../api/common/lib/MultiToken';
 import classnames from 'classnames';
 import type { WalletChecksum } from '@emurgo/cip4-js';
-import type { $npm$ReactIntl$IntlFormat, $npm$ReactIntl$MessageDescriptor } from 'react-intl';
 import type { ConceptualWallet } from '../../api/ada/lib/storage/models/ConceptualWallet/index';
+import { isLedgerNanoWallet, isTrezorTWallet, } from '../../api/ada/lib/storage/models/ConceptualWallet/index';
 import globalMessages from '../../i18n/global-messages';
-import {
-  isLedgerNanoWallet,
-  isTrezorTWallet,
-} from '../../api/ada/lib/storage/models/ConceptualWallet/index';
-import type { TokenLookupKey } from '../../api/common/lib/MultiToken';
 import type { TokenRow } from '../../api/ada/lib/storage/database/primitives/tables';
-import { ReactComponent as DragIcon }  from '../../assets/images/add-wallet/wallet-list/drag.inline.svg';
+import { ReactComponent as DragIcon } from '../../assets/images/add-wallet/wallet-list/drag.inline.svg';
 import { Draggable } from 'react-beautiful-dnd';
 import type { UnitOfAccountSettingType } from '../../types/unitOfAccountType';
 import AmountDisplay from '../common/AmountDisplay';
@@ -192,14 +189,8 @@ export default class WalletCard extends Component<Props, State> {
     );
   }
 
-  getTotalAmount: void => null | MultiToken = () => {
-    if (this.props.rewards === undefined) {
-      return this.props.walletAmount;
-    }
-    if (this.props.rewards === null || this.props.walletAmount === null) {
-      return null;
-    }
-    return this.props.rewards.joinAddCopy(this.props.walletAmount);
+  getTotalAmount: void => ?MultiToken = () => {
+    return MultiToken.sumOrEitherNotNull(this.props.walletAmount, this.props.rewards);
   };
 
   countTokenTypes: void => {|tokenTypes: number, nfts: number|} = () => {