m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254

Browse Source
This commit is contained in:
Alexander Tseung 2018-02-08 21:46:19 -08:00
commit ef0bbb291d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/app/selectors.js
View File

@ -116,7 +116,7 @@ function transactionsSelector (state) {
// console.log({txsToRender, selectedTokenAddress}) // console.log({txsToRender, selectedTokenAddress})
return selectedTokenAddress return selectedTokenAddress
? txsToRender ? txsToRender
.filter(({ txParams: { to } }) => to === selectedTokenAddress) .filter(({ txParams }) => txParams && txParams.to === selectedTokenAddress)
.sort((a, b) => b.time - a.time) .sort((a, b) => b.time - a.time)
: txsToRender : txsToRender
.sort((a, b) => b.time - a.time) .sort((a, b) => b.time - a.time)
@ -179,11 +179,11 @@ function autoAddToBetaUI (state) {
(numberOfAccounts > autoAddAccountsThreshold) && (numberOfAccounts > autoAddAccountsThreshold) &&
(numberOfTokensAdded > autoAddTokensThreshold) (numberOfTokensAdded > autoAddTokensThreshold)
const userIsNotInBeta = !state.metamask.featureFlags.betaUI const userIsNotInBeta = !state.metamask.featureFlags.betaUI
return userIsNotInBeta && userPassesThreshold return userIsNotInBeta && userPassesThreshold
} }
function getCurrentViewContext (state) { function getCurrentViewContext (state) {
const { currentView = {} } = state.appState const { currentView = {} } = state.appState
return currentView.context return currentView.context
} }