Skip to content

Commit

Permalink
fix(tx): ordering of algo and sb ttransactions
Browse files Browse the repository at this point in the history
  • Loading branch information
Philip London committed Jul 21, 2020
1 parent b40c056 commit 6ba93ff
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
Expand Up @@ -47,6 +47,12 @@ export default () => {
case contains('/algo/transactions', pathname):
yield call(refreshAlgoTransactions)
break
case contains('/eur/transactions', pathname):
yield put(actions.core.data.fiat.fetchTransactions('EUR', true))
break
case contains('/gbp/transactions', pathname):
yield put(actions.core.data.fiat.fetchTransactions('GBP', true))
break
case contains('/lockbox/', pathname):
yield put(
actions.components.lockbox.initializeDashboard(
Expand Down
4 changes: 2 additions & 2 deletions packages/blockchain-wallet-v4/src/redux/data/algo/reducers.ts
Expand Up @@ -46,10 +46,10 @@ export const algoReducer = (
return {
...state,
transactions: [
Remote.Success(action.payload.transactions),
...state.transactions.filter(
(tx, i) => i !== state.transactions.length - 1
)
),
Remote.Success(action.payload.transactions)
]
}
default: {
Expand Down
4 changes: 2 additions & 2 deletions packages/blockchain-wallet-v4/src/redux/data/fiat/reducers.ts
Expand Up @@ -51,8 +51,8 @@ export const fiatReducer = (
...state,
[action.payload.currency]: {
transactions: [
Remote.Success(action.payload.response.items),
...txs.filter((tx, i) => i !== txs.length - 1)
...txs.filter((tx, i) => i !== txs.length - 1),
Remote.Success(action.payload.response.items)
],
next: Remote.Success(action.payload.response.next),
prev: Remote.Success(action.payload.response.prev)
Expand Down

0 comments on commit 6ba93ff

Please sign in to comment.