From fb9c829b2f3575f76f0b80ccc1a9b057fa6c9c18 Mon Sep 17 00:00:00 2001
From: Sam Peters <unclesamtoshi@protonmail.com>
Date: Tue, 14 Mar 2023 14:01:45 -0500
Subject: [PATCH] address pr feedback

---
 app/hooks/use-display-currency.ts                      | 10 +++++++---
 .../send-bitcoin-details-screen.tsx                    | 10 ++--------
 app/types/amounts.ts                                   |  4 ++--
 e2e/config/wdio.conf.js                                |  2 ++
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/hooks/use-display-currency.ts b/app/hooks/use-display-currency.ts
index da1a461ae5..4b7af712e7 100644
--- a/app/hooks/use-display-currency.ts
+++ b/app/hooks/use-display-currency.ts
@@ -222,9 +222,13 @@ export const useDisplayCurrency = () => {
         walletAmount,
       })
 
-      return `${formatMoneyAmount(primaryAmountWithDefault)}${
-        secondaryAmount ? ` (${formatMoneyAmount(secondaryAmount)})` : ""
-      }`
+      if (secondaryAmount) {
+        return `${formatMoneyAmount(primaryAmountWithDefault)} (${formatMoneyAmount(
+          secondaryAmount,
+        )})`
+      }
+
+      return formatMoneyAmount(primaryAmountWithDefault)
     },
     [getSecondaryAmountIfCurrencyIsDifferent, formatMoneyAmount],
   )
diff --git a/app/screens/send-bitcoin-screen/send-bitcoin-details-screen.tsx b/app/screens/send-bitcoin-screen/send-bitcoin-details-screen.tsx
index f1d4c2ed13..1aa7f46bdf 100644
--- a/app/screens/send-bitcoin-screen/send-bitcoin-details-screen.tsx
+++ b/app/screens/send-bitcoin-screen/send-bitcoin-details-screen.tsx
@@ -347,10 +347,7 @@ const SendBitcoinDetailsScreen: React.FC<Props> = ({ route }) => {
   let validAmount = true
   let invalidAmountErrorMessage = ""
 
-  if (
-    moneyAmountIsCurrencyType(settlementAmount, WalletCurrency.Btc) &&
-    btcBalanceMoneyAmount
-  ) {
+  if (moneyAmountIsCurrencyType(settlementAmount, WalletCurrency.Btc)) {
     validAmount = lessThanOrEqualTo({
       value: settlementAmount,
       lessThanOrEqualTo: btcBalanceMoneyAmount,
@@ -362,10 +359,7 @@ const SendBitcoinDetailsScreen: React.FC<Props> = ({ route }) => {
     }
   }
 
-  if (
-    moneyAmountIsCurrencyType(settlementAmount, WalletCurrency.Usd) &&
-    usdBalanceMoneyAmount
-  ) {
+  if (moneyAmountIsCurrencyType(settlementAmount, WalletCurrency.Usd)) {
     validAmount = lessThanOrEqualTo({
       value: settlementAmount,
       lessThanOrEqualTo: usdBalanceMoneyAmount,
diff --git a/app/types/amounts.ts b/app/types/amounts.ts
index f11b6bb865..6c345aa8ef 100644
--- a/app/types/amounts.ts
+++ b/app/types/amounts.ts
@@ -100,7 +100,7 @@ export const addMoneyAmounts = <T extends WalletOrDisplayCurrency>({
 }: {
   a: MoneyAmount<T>
   b: MoneyAmount<T>
-}) => {
+}): MoneyAmount<T> => {
   return {
     amount: a.amount + b.amount,
     currency: a.currency,
@@ -113,7 +113,7 @@ export const subtractMoneyAmounts = <T extends WalletOrDisplayCurrency>({
 }: {
   a: MoneyAmount<T>
   b: MoneyAmount<T>
-}) => {
+}): MoneyAmount<T> => {
   return {
     amount: a.amount - b.amount,
     currency: a.currency,
diff --git a/e2e/config/wdio.conf.js b/e2e/config/wdio.conf.js
index 8cc65c0d7f..5a97779755 100644
--- a/e2e/config/wdio.conf.js
+++ b/e2e/config/wdio.conf.js
@@ -40,6 +40,8 @@ const baseSpec = {
   },
 }
 
+exports.baseSpec = baseSpec
+
 exports.config = {
   ...baseSpec,
   capabilities: [capabilities],