Feat/eth http poll

public/main/client/handlers/single-core.js

@@ -277,6 +277,11 @@ function refreshAllContracts({}, { api }) {
   return api.contracts.refreshContracts(null, walletId);
 }
 
+function startWatchingContracts({}, { api }) {
+  const walletId = wallet.getAddress().address;
+  return api.contracts.startWatching();
+}
+
 function refreshTransaction({ hash, address }, { api }) {
   return pTimeout(
     api.explorer.refreshTransaction(hash, address),
@@ -372,6 +377,7 @@ function getPastTransactions({ address, page, pageSize }, { api }) {
 module.exports = {
   // refreshAllSockets,
   refreshAllContracts,
+  startWatchingContracts,
   purchaseContract,
   createContract,
   cancelContract,

public/main/client/index.js

@@ -29,7 +29,8 @@ function startCore({ chain, core, config: coreConfig }, webContent) {
     "transactions-scan-started",
     "transactions-scan-finished",
     "contracts-scan-started",
-    "contracts-scan-finished"
+    "contracts-scan-finished",
+    "contracts-updated",
   );
 
   function send(eventName, data) {
@@ -59,10 +60,10 @@ function startCore({ chain, core, config: coreConfig }, webContent) {
         return api.explorer
           .syncTransactions(
             0,
-            address,
             (number) => storage.setSyncBlock(number, chain),
             page,
-            pageSize
+            pageSize,
+            address
           )
           .then(function() {
             send("transactions-scan-finished", { success: true });
@@ -87,7 +88,10 @@ function startCore({ chain, core, config: coreConfig }, webContent) {
       });
   }
 
-  emitter.on("open-wallet", syncTransactions);
+  emitter.on("open-wallet", (props) => { 
+    syncTransactions(props);
+    api.contracts.startWatching({});
+  });
 
   emitter.on("wallet-error", function(err) {
     logger.warn(

public/main/client/subscriptions/single-core.js

@@ -9,6 +9,7 @@ const listeners = {
   "login-submit": handlers.onLoginSubmit,
   // 'refresh-all-sockets': handlers.refreshAllSockets,
   "refresh-all-contracts": handlers.refreshAllContracts,
+  "start-watching-contracts": handlers.startWatchingContracts,
   "refresh-all-transactions": handlers.refreshAllTransactions,
   "refresh-transaction": handlers.refreshTransaction,
   "get-gas-limit": handlers.getGasLimit,

src/client/index.js

@@ -111,6 +111,10 @@ const createClient = function(createStore) {
       'refresh-all-contracts',
       120000
     ),
+    startWatchingContracts: utils.forwardToMainProcess(
+      'start-watching-contracts',
+      120000
+    ),
     onOnboardingCompleted: utils.forwardToMainProcess('onboarding-completed'),
     recoverFromMnemonic: utils.forwardToMainProcess('recover-from-mnemonic'),
     getTokenGasLimit: utils.forwardToMainProcess('get-token-gas-limit'),

src/components/contracts/BuyerHub.js

@@ -87,7 +87,7 @@ function BuyerHub({
 
   const [isHistoryModalOpen, setIsHistoryModalOpen] = useState(false);
 
-  const contractsWithHistory = contracts.filter(c => c.history.length);
+  const contractsWithHistory = contracts.filter(c => c.history?.length);
   const showHistory = contractsWithHistory.length;
   const onHistoryOpen = () => setIsHistoryModalOpen(true);
 

src/store/reducers/contracts.js

@@ -44,6 +44,17 @@ const reducer = handleActions(
       };
     },
 
+    'contracts-updated': (state, { payload }) => {
+      const idContractMap = keyBy(payload.actives, 'id');
+
+      return {
+        ...state,
+        actives: { ...state.actives, ...idContractMap },
+        lastUpdated: parseInt(Date.now() / 1000, 10),
+        syncStatus: 'up-to-date'
+      };
+    },
+
     'remove-draft': (state, { payload }) => ({
       ...state,
       drafts: Object.assign(state.drafts, []).filter(

src/store/reducers/wallet.js

@@ -26,6 +26,10 @@ export const initialState = {
  * Should filter transactions without receipt if we received ones
  */
 const mergeTransactions = (stateTxs, payloadTxs) => {
+  console.log(
+    '🚀 ~ file: wallet.js:29 ~ mergeTransactions ~ payloadTxs:',
+    payloadTxs
+  );
   const txWithReceipts = payloadTxs.filter(tx => tx.receipt);
   const newStateTxs = { ...stateTxs };
 
@@ -118,10 +122,7 @@ const reducer = handleActions(
       ...state,
       token: {
         ...state.token,
-        transactions: mergeTransactions(
-          state.token.transactions,
-          payload.transactions
-        )
+        transactions: mergeTransactions(state.token.transactions, payload)
       }
     }),
 

src/subscriptions.js

@@ -10,6 +10,7 @@ export const subscribeToMainProcessMessages = function(store) {
     'transactions-scan-finished',
     'transactions-scan-started',
     'contracts-scan-finished',
+    'contracts-updated',
     'contracts-scan-started',
     'wallet-state-changed',
     'coin-price-updated',