Handle missing height & timestamp when unconfirmed

Author: swansontec

src/MoneroEngine.ts

@@ -231,12 +231,8 @@ export class MoneroEngine implements EdgeCurrencyEngine {
       ourReceiveAddresses.push(this.walletInfo.keys.moneroAddress.toLowerCase())
     }
 
-    let blockHeight = tx.height
-    if (tx.mempool) {
-      blockHeight = 0
-    }
-
-    const date = Date.parse(tx.timestamp) / 1000
+    const blockHeight = tx.height == null || tx.mempool ? 0 : tx.height
+    const date = tx.timestamp == null ? new Date() : new Date(tx.timestamp)
 
     // Expose legacy payment ID's to the GUI. This only applies
     // to really old transactions, before integrated addresses:
@@ -249,10 +245,10 @@ export class MoneroEngine implements EdgeCurrencyEngine {
       })
     }
 
-    let edgeTransaction: EdgeTransaction = {
+    const edgeTransaction: EdgeTransaction = {
       blockHeight,
       currencyCode: 'XMR',
-      date,
+      date: date.valueOf() / 1000,
       isSend: lt(netNativeAmount, '0'),
       memos,
       nativeAmount: netNativeAmount,
@@ -280,16 +276,14 @@ export class MoneroEngine implements EdgeCurrencyEngine {
       // Already have this tx in the database. See if anything changed
       const transactionsArray: EdgeTransaction[] =
         this.walletLocalData.transactionsObj[PRIMARY_CURRENCY]
-      const edgeTx = transactionsArray[idx]
+      const oldTx = transactionsArray[idx]
 
-      if (edgeTx.blockHeight !== edgeTransaction.blockHeight) {
+      if (oldTx.date < edgeTransaction.date) edgeTransaction.date = oldTx.date
+      if (oldTx.blockHeight !== edgeTransaction.blockHeight) {
         // The native amounts returned from the API take some time before they're accurate. We can trust the amounts we saved instead.
-        edgeTransaction = {
-          ...edgeTransaction,
-          nativeAmount: edgeTx.nativeAmount
-        }
+        edgeTransaction.nativeAmount = oldTx.nativeAmount
 
-        this.log(`Update transaction: ${tx.hash} height:${tx.height}`)
+        this.log(`Update transaction: ${tx.hash} height:${blockHeight}`)
         this.updateTransaction(PRIMARY_CURRENCY, edgeTransaction, idx)
         this.edgeTxLibCallbacks.onTransactionsChanged(
           this.transactionsChangedArray

src/MyMoneroApi.ts

@@ -74,13 +74,13 @@ export interface ParsedTransaction {
   // See asGetAddressTxsResponse for these fields:
   coinbase: boolean
   hash: string
-  height: number
+  height?: number
   id: number
   mempool: boolean
   mixin: number
   payment_id?: string
   spent_outputs?: SpentOutput[]
-  timestamp: string
+  timestamp?: string
   total_received: string
   total_sent: string
   unlock_time: number
@@ -123,13 +123,13 @@ const asGetAddressTxsResponse = asObject({
       asObject({
         coinbase: asNumberBoolean, // True if tx is coinbase
         hash: asString, // Bytes of tx hash
-        height: asNumber, // Block height
+        height: asOptional(asNumber), // Block height
         id: asNumber, // Index of tx in blockchain
         mempool: asNumberBoolean, // True if tx is in mempool
         mixin: asNumber, // Mixin of the receive
         payment_id: asOptional(asString), // Bytes of tx payment id
         spent_outputs: asOptional(asArray(asSpentOutput)), // List of possible spends
-        timestamp: asString, // Timestamp of block
+        timestamp: asOptional(asString), // Timestamp of block
         total_received: asString, // Total XMR received
         total_sent: asString, // XMR possibly being spent
         unlock_time: asNumber // Tx unlock time field