fix: confirmations is a number always

juanky201271 · Oct 29, 2023 · 5bce4a4 · 5bce4a4
1 parent 079c199
commit 5bce4a4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 19 deletions.
diff --git a/app/AppState/types/TransactionType.ts b/app/AppState/types/TransactionType.ts
@@ -3,7 +3,7 @@ import TxDetailType from './TxDetailType';
 export default interface TransactionType {
   type: 'Sent' | 'Received' | 'SendToSelf'; // like kind
   fee?: number;
-  confirmations: number | null;
+  confirmations: number;
   txid: string;
   time: number;
   zec_price?: number;

diff --git a/app/rpc/RPC.ts b/app/rpc/RPC.ts
@@ -1395,7 +1395,7 @@ export default class RPC {
             currentTxList[0].type = type;
           }
           if (tx.unconfirmed) {
-            currentTxList[0].confirmations = null;
+            currentTxList[0].confirmations = 0;
           } else if (!currentTxList[0].confirmations) {
             currentTxList[0].confirmations = this.lastServerBlockHeight
               ? this.lastServerBlockHeight - tx.block_height + 1

diff --git a/components/History/components/TxDetail.tsx b/components/History/components/TxDetail.tsx
@@ -29,11 +29,7 @@ const TxDetail: React.FunctionComponent<TxDetailProps> = ({ tx, closeModal, set_
   const { info, translate, language, privacy, addLastSnackbar, server, currency } = context;
   const { colors } = useTheme() as unknown as ThemeType;
   const spendColor =
-    tx.confirmations === null || tx.confirmations === 0
-      ? colors.primaryDisabled
-      : tx.type === 'Received'
-      ? colors.primary
-      : colors.text;
+    tx.confirmations === 0 ? colors.primaryDisabled : tx.type === 'Received' ? colors.primary : colors.text;
   const [expandAddress, setExpandAddress] = useState(false);
   const [expandTxid, setExpandTxid] = useState(false);
   moment.locale(language);

diff --git a/components/History/components/TxSummaryLine.tsx b/components/History/components/TxSummaryLine.tsx
@@ -34,14 +34,9 @@ const TxSummaryLine: React.FunctionComponent<TxSummaryLineProps> = ({
   const { colors } = useTheme() as unknown as ThemeType;
 
   const amountColor =
-    tx.confirmations === null || tx.confirmations === 0
-      ? colors.primaryDisabled
-      : tx.type === 'Received'
-      ? colors.primary
-      : colors.text;
+    tx.confirmations === 0 ? colors.primaryDisabled : tx.type === 'Received' ? colors.primary : colors.text;
 
-  const txIcon =
-    tx.confirmations === null || tx.confirmations === 0 ? faRefresh : tx.type === 'Received' ? faArrowDown : faArrowUp;
+  const txIcon = tx.confirmations === 0 ? faRefresh : tx.type === 'Received' ? faArrowDown : faArrowUp;
   moment.locale(language);
 
   // if no address I'm going to put txid here.

diff --git a/rust/Cargo.lock b/rust/Cargo.lock