Skip to content

Commit

Permalink
Merge branch 'william/no-engines'
Browse files Browse the repository at this point in the history
  • Loading branch information
swansontec committed Sep 25, 2019
2 parents f78e97d + e76958b commit 49ddfd2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions src/actions/CryptoExchangeActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export const exchangeTimerExpired = (swapInfo: GuiSwapInfo) => async (dispatch:
Actions[Constants.EXCHANGE_QUOTE_PROCESSING_SCENE]()

try {
console.log('refreshing', swapInfo)
swapInfo = await fetchSwapQuote(getState(), swapInfo.request)
Actions[Constants.EXCHANGE_QUOTE_SCENE]({ swapInfo })
dispatch({ type: 'UPDATE_SWAP_QUOTE', data: swapInfo })
Expand Down
11 changes: 6 additions & 5 deletions src/components/services/EdgeCoreManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ export class EdgeCoreManager extends PureComponent<Props, State> {
if (this.paused !== paused) {
this.paused = paused

const { context } = this.state
if (context != null) {
// TODO: Display a popdown error alert once we get that redux-free:
context.changePaused(paused, { secondsDelay: paused ? 20 : 0 }).catch(e => console.log(e))
}
// const { context } = this.state
// if (context != null) {
// // TODO: Display a popdown error alert once we get that redux-free:
// context.changePaused(paused, { secondsDelay: paused ? 20 : 0 }).catch(e => console.log(e))
// }
}
}

Expand All @@ -91,6 +91,7 @@ export class EdgeCoreManager extends PureComponent<Props, State> {
context.on('close', () => {
this.setState({ context: null })
})
context.changePaused(true)
this.setState(state => ({ context, counter: state.counter + 1 }), () => this.hideSplash())
}

Expand Down

0 comments on commit 49ddfd2

Please sign in to comment.