From 9bb2f951b346e67a96b1d809ff3cc8488f65f89c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20S=C3=A1?= <github-siiky@net-c.cat>
Date: Mon, 25 Oct 2021 23:30:42 +0100
Subject: [PATCH] feat: update transaction details on cancel

---
 .../src/pages/Transactions/DetailsCard.js     |  2 +-
 .../src/pages/Transactions/Transactions.js    | 30 +++++++------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
index a339d421..5a646fc6 100644
--- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
+++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
@@ -341,5 +341,5 @@ const DetailsRow = ({ it: tx, timezone }) => {
 export default memo(
   DetailsRow,
   (prev, next) =>
-    prev.it.id === next.it.id && prev.it.hasError === next.it.hasError
+    prev.it.id === next.it.id && getStatus(prev.it) === getStatus(next.it)
 )
diff --git a/new-lamassu-admin/src/pages/Transactions/Transactions.js b/new-lamassu-admin/src/pages/Transactions/Transactions.js
index a9b576bb..9cec7852 100644
--- a/new-lamassu-admin/src/pages/Transactions/Transactions.js
+++ b/new-lamassu-admin/src/pages/Transactions/Transactions.js
@@ -4,7 +4,7 @@ import BigNumber from 'bignumber.js'
 import gql from 'graphql-tag'
 import { utils as coinUtils } from 'lamassu-coins'
 import * as R from 'ramda'
-import React, { useEffect, useState } from 'react'
+import React, { useState } from 'react'
 import { useHistory } from 'react-router-dom'
 
 import LogsDowloaderPopover from 'src/components/LogsDownloaderPopper'
@@ -122,23 +122,15 @@ const Transactions = () => {
   const { data: filtersResponse, loading: loadingFilters } = useQuery(
     GET_TRANSACTION_FILTERS
   )
-  const [filteredTransactions, setFilteredTransactions] = useState([])
   const [variables, setVariables] = useState({ limit: NUM_LOG_RESULTS })
-  const {
-    data: txResponse,
-    loading: loadingTransactions,
-    refetch,
-    startPolling,
-    stopPolling
-  } = useQuery(GET_TRANSACTIONS, {
-    variables,
-    onCompleted: data => setFilteredTransactions(R.path(['transactions'])(data))
-  })
-
-  useEffect(() => {
-    startPolling(10000)
-    return stopPolling
-  })
+  const { data: txData, loading: loadingTransactions, refetch } = useQuery(
+    GET_TRANSACTIONS,
+    {
+      variables,
+      pollInterval: 10000
+    }
+  )
+  const txList = txData ? txData.transactions : []
 
   const { data: configResponse, configLoading } = useQuery(GET_DATA)
   const timezone = R.path(['config', 'locale_timezone'], configResponse)
@@ -273,7 +265,7 @@ const Transactions = () => {
               onChange={onFilterChange}
             />
           </div>
-          {txResponse && (
+          {txList && (
             <div className={classes.buttonsWrapper}>
               <LogsDowloaderPopover
                 title="Download logs"
@@ -307,7 +299,7 @@ const Transactions = () => {
         loading={loadingTransactions && configLoading}
         emptyText="No transactions so far"
         elements={elements}
-        data={filteredTransactions}
+        data={txList}
         Details={DetailsRow}
         expandable
         rowSize="sm"