From cd9c759de91446c1cab5c07e710b2debf6723ecd Mon Sep 17 00:00:00 2001 From: apanizo Date: Tue, 14 Aug 2018 10:55:17 +0200 Subject: [PATCH] WA-521 Disabling tx-history-service tracker for daily limit operations --- src/logic/safe/safeBlockchainOperations.js | 11 +++++++---- src/test/safe.redux.transactions.test.js | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/logic/safe/safeBlockchainOperations.js b/src/logic/safe/safeBlockchainOperations.js index d6839bf6..ad28c9a4 100644 --- a/src/logic/safe/safeBlockchainOperations.js +++ b/src/logic/safe/safeBlockchainOperations.js @@ -66,12 +66,15 @@ export const executeDailyLimit = async ( const gas = await calculateGasOf(dailyLimitData, sender, dailyLimitModule.address) const gasPrice = await calculateGasPrice() - const txHash = await dailyLimitModule.executeDailyLimit(0, to, valueInWei, { from: sender, gas, gasPrice }) - checkReceiptStatus(txHash.tx) + const txReceipt = await dailyLimitModule.executeDailyLimit(0, to, valueInWei, { from: sender, gas, gasPrice }) + checkReceiptStatus(txReceipt.tx) + /* + // Temporarily disabled for daily limit operations const operation = 0 // CALL for all currencies const data = '' // empty for ETH - await submitOperation(safeAddress, to, valueInWei, data, operation, nonce, txHash, sender, 'execution') - return txHash + await submitOperation(safeAddress, to, Number(valueInWei), data, operation, nonce, txReceipt.tx, sender, 'execution') + */ + return txReceipt.tx } diff --git a/src/test/safe.redux.transactions.test.js b/src/test/safe.redux.transactions.test.js index 59250a34..6e17b662 100644 --- a/src/test/safe.redux.transactions.test.js +++ b/src/test/safe.redux.transactions.test.js @@ -61,6 +61,8 @@ describe('Transactions Suite', () => { ]) testTransactionFrom(transactions, 1, 'Add Owner Third account', nonce + 100, 0, safeAddress, secondTxData, false, secondTxConfirmations) + localStorage.clear() + store.dispatch(fetchTransactions()) transactions = safeTransactionsSelector(store.getState(), { safeAddress }) testSizeOfTransactions(transactions, 2)