Skip to content
Permalink
Browse files

Merge branch 'feature/ddw-983-implement-transfer-funds-wizard-for-inc…

…entivized-testnet' of https://github.com/input-output-hk/daedalus into feature/ddw-983-implement-transfer-funds-wizard-for-incentivized-testnet
  • Loading branch information...
daniloprates committed Nov 8, 2019
2 parents 96239cc + 844cf69 commit f0e6e51f5eeca9709209301d1a6a601ea1e5eeff
Showing with 3 additions and 4 deletions.
  1. +1 −2 source/renderer/app/api/api.js
  2. +2 −2 source/renderer/app/stores/TransactionsStore.js
@@ -265,7 +265,6 @@ export default class AdaApi {
} else {
response = await getTransactionHistory(this.config, walletId, params);
}

const transactions = response.map(tx =>
_createTransactionFromServerData(tx)
);
@@ -963,7 +962,7 @@ export default class AdaApi {
}
);
Logger.debug('AdaApi::transferFundsCalculateFee success', { response });
return _createMigrationFeeFromServerData(response)
return _createMigrationFeeFromServerData(response);
} catch (error) {
Logger.error('AdaApi::transferFundsCalculateFee error', { error });
throw new GenericApiError();
@@ -130,8 +130,8 @@ export default class TransactionsStore extends Store {

@action _refreshTransactionData = () => {
if (this.stores.networkStatus.isConnected) {
const { allWallets } = this.stores.wallets;
for (const wallet of allWallets) {
const { all: wallets } = this.stores.wallets;
for (const wallet of wallets) {
const recentRequest = this._getTransactionsRecentRequest(wallet.id);
recentRequest.execute({
walletId: wallet.id,

0 comments on commit f0e6e51

Please sign in to comment.
You can’t perform that action at this time.