address pr feedback

GaloyMoney · Mar 14, 2023 · fb9c829 · fb9c829
1 parent 1bc4050
commit fb9c829
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -40,6 +40,8 @@ const baseSpec = {
   },
 }
 
+exports.baseSpec = baseSpec
+
 exports.config = {
   ...baseSpec,
   capabilities: [capabilities],