aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2016-05-11 08:22:09 +0800
committerkumavis <aaron@kumavis.me>2016-05-11 08:22:09 +0800
commit9c91da72f5ab67d06061c80be0f735d222d2f4dd (patch)
tree59b3f3b32ef5b90144d30a5a322b964f04b372de
parentc2c33ff6cdabfd6f766c57c7d6d142074bf305ae (diff)
downloadtangerine-wallet-browser-9c91da72f5ab67d06061c80be0f735d222d2f4dd.tar
tangerine-wallet-browser-9c91da72f5ab67d06061c80be0f735d222d2f4dd.tar.gz
tangerine-wallet-browser-9c91da72f5ab67d06061c80be0f735d222d2f4dd.tar.bz2
tangerine-wallet-browser-9c91da72f5ab67d06061c80be0f735d222d2f4dd.tar.lz
tangerine-wallet-browser-9c91da72f5ab67d06061c80be0f735d222d2f4dd.tar.xz
tangerine-wallet-browser-9c91da72f5ab67d06061c80be0f735d222d2f4dd.tar.zst
tangerine-wallet-browser-9c91da72f5ab67d06061c80be0f735d222d2f4dd.zip
ui - account list - fix select account
-rw-r--r--ui/app/account-detail.js5
-rw-r--r--ui/app/accounts.js4
-rw-r--r--ui/app/css/index.css5
3 files changed, 12 insertions, 2 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 2775e24fb..ae4552df6 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -127,8 +127,13 @@ AccountDetailScreen.prototype.transactionList = function() {
var transactions = state.transactions
return transactionList(transactions
+ // only transactions that have a hash
+ .filter(tx => tx.hash)
+ // only transactions that are from the current address
.filter(tx => tx.txParams.from === state.address)
+ // only transactions that are on the current network
.filter(tx => tx.txParams.metamaskNetworkId === state.networkVersion)
+ // sort by recency
.sort((a, b) => b.time - a.time), state.networkVersion)
}
diff --git a/ui/app/accounts.js b/ui/app/accounts.js
index 31aaf7797..3f0a3e819 100644
--- a/ui/app/accounts.js
+++ b/ui/app/accounts.js
@@ -97,12 +97,12 @@ AccountsScreen.prototype.render = function() {
var identiconSrc = `data:image/png;base64,${identicon}`
return (
- h('.accounts-list-option.flex-row.flex-space-between', {
+ h('.accounts-list-option.flex-row.flex-space-between.cursor-pointer', {
style: {
flex: '1 0 auto',
background: isSelected ? 'white' : 'none',
},
- // onClick: state.onClick,
+ onClick: (event) => actions.onShowDetail(identity.address, event),
}, [
// account identicon
diff --git a/ui/app/css/index.css b/ui/app/css/index.css
index cde130dfe..59577f76c 100644
--- a/ui/app/css/index.css
+++ b/ui/app/css/index.css
@@ -250,6 +250,11 @@ app sections
height: 120px;
}
+.accounts-list-option:hover {
+ background: pink;
+ transform: scale(1.1);
+}
+
.accounts-list-option .identicon-wrapper {
width: 100px;
}