aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorWhymarrh Whitby <whymarrh.whitby@gmail.com>2019-08-21 02:52:00 +0800
committerGitHub <noreply@github.com>2019-08-21 02:52:00 +0800
commite47448362de84e07905aac0f5bd418b92bbd7288 (patch)
treebb66b6feac5218d8c01cde1936cb721246e8e6b4 /ui
parent821529622e4baf095dc34c309b878d09f945da9b (diff)
downloadtangerine-wallet-browser-e47448362de84e07905aac0f5bd418b92bbd7288.tar.gz
tangerine-wallet-browser-e47448362de84e07905aac0f5bd418b92bbd7288.tar.zst
tangerine-wallet-browser-e47448362de84e07905aac0f5bd418b92bbd7288.zip
Bug fixes for incoming transactions (#7043)
* Fix styling of `.transaction-list` * Filter `incomingTxListSelector` by network as well * Start and stop block tracker polling in incoming tx controller * Add fetch with abort in bg for `IncomingTxController`
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/app/transaction-list/index.scss33
-rw-r--r--ui/app/selectors/transactions.js5
2 files changed, 11 insertions, 27 deletions
diff --git a/ui/app/components/app/transaction-list/index.scss b/ui/app/components/app/transaction-list/index.scss
index 7535137e2..42eddd31e 100644
--- a/ui/app/components/app/transaction-list/index.scss
+++ b/ui/app/components/app/transaction-list/index.scss
@@ -11,34 +11,15 @@
}
&__header {
+ flex: 0 0 auto;
+ font-size: 14px;
+ line-height: 20px;
+ color: $Grey-400;
border-bottom: 1px solid $Grey-100;
+ padding: 8px 0 8px 20px;
- &__tabs {
- display: flex;
- }
-
- &__tab,
- &__tab--selected {
- flex: 0 0 auto;
- font-size: 14px;
- line-height: 20px;
- color: $Grey-400;
- padding: 8px 0 8px 20px;
- cursor: pointer;
-
- &:hover {
- font-weight: bold;
- }
-
- @media screen and (max-width: $break-small) {
- padding: 8px 0 8px 16px;
- }
- }
-
- &__tab--selected {
- font-weight: bold;
- color: $Blue-400;
- cursor: auto;
+ @media screen and (max-width: $break-small) {
+ padding: 8px 0 8px 16px;
}
}
diff --git a/ui/app/selectors/transactions.js b/ui/app/selectors/transactions.js
index 5450978a6..d52170c34 100644
--- a/ui/app/selectors/transactions.js
+++ b/ui/app/selectors/transactions.js
@@ -16,9 +16,12 @@ import txHelper from '../../lib/tx-helper'
export const shapeShiftTxListSelector = state => state.metamask.shapeShiftTxList
export const incomingTxListSelector = state => {
+ const network = state.metamask.network
const selectedAddress = state.metamask.selectedAddress
return Object.values(state.metamask.incomingTransactions)
- .filter(({ txParams }) => txParams.to === selectedAddress)
+ .filter(({ metamaskNetworkId, txParams }) => (
+ txParams.to === selectedAddress && metamaskNetworkId === network
+ ))
}
export const unapprovedMsgsSelector = state => state.metamask.unapprovedMsgs
export const selectedAddressTxListSelector = state => state.metamask.selectedAddressTxList