Merge pull request zingolabs#546 from juanky201271/dev_unconfirmed_ne…

…w_field_summaries Unconfirmed field added
juanky201271 · Oct 29, 2023 · bbdd5e6 · bbdd5e6
2 parents cb77ebb + 7923995
commit bbdd5e6
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 88 deletions.
diff --git a/android/app/src/androidTest/java/org/ZingoLabs/Zingo/RustFFITest.kt b/android/app/src/androidTest/java/org/ZingoLabs/Zingo/RustFFITest.kt
@@ -97,7 +97,8 @@ data class Summaries (
     val to_address : String?,
     val memos : List<String>?,
     val kind : String,
-    val pool : String?
+    val pool : String?,
+    val unconfirmed : Boolean
 )
 
 @Category(OfflineTest::class)

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

diff --git a/app/rpc/types/RPCSummariesType.ts b/app/rpc/types/RPCSummariesType.ts
@@ -8,4 +8,5 @@ export type RPCSummariesType = {
   memos?: string[];
   kind: 'Sent' | 'Received' | 'SendToSelf' | 'Fee';
   pool?: 'Orchard' | 'Sapling' | 'Transparent' | 'None';
+  unconfirmed: boolean;
 };
diff --git a/components/History/components/TxDetail.tsx b/components/History/components/TxDetail.tsx
@@ -117,7 +117,7 @@ const TxDetail: React.FunctionComponent<TxDetailProps> = ({ tx, closeModal, set_
             </View>
             <View style={{ display: 'flex', alignItems: 'flex-end' }}>
               <FadeText>{translate('history.confirmations') as string}</FadeText>
-              <RegText>{tx.confirmations ? tx.confirmations.toString() : '-'}</RegText>
+              <RegText>{tx.confirmations.toString()}</RegText>
             </View>
           </View>