aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-07-12 12:05:18 +0800
committerGitHub <noreply@github.com>2016-07-12 12:05:18 +0800
commit947665dca1ba01bca93024fa99c3397fcab6f686 (patch)
tree05aa083182d6866885115d9aa737303e316ba099 /ui
parent678f33b06b2a2318ed0bf43ac9128f796161ca31 (diff)
parent57da5a8198d6168ce004142a0b9ca810033faa76 (diff)
downloadtangerine-wallet-browser-947665dca1ba01bca93024fa99c3397fcab6f686.tar.gz
tangerine-wallet-browser-947665dca1ba01bca93024fa99c3397fcab6f686.tar.zst
tangerine-wallet-browser-947665dca1ba01bca93024fa99c3397fcab6f686.zip
Merge pull request #428 from MetaMask/FixSvgIcons
Fix svg icons
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/pending-tx-details.js10
-rw-r--r--ui/lib/contract-namer.js1
2 files changed, 5 insertions, 6 deletions
diff --git a/ui/app/components/pending-tx-details.js b/ui/app/components/pending-tx-details.js
index c9d3251e1..9a06ad09e 100644
--- a/ui/app/components/pending-tx-details.js
+++ b/ui/app/components/pending-tx-details.js
@@ -165,12 +165,13 @@ PTXP.miniAccountPanelForRecipient = function () {
var txData = props.txData
var txParams = txData.txParams || {}
var isContractDeploy = !('to' in txParams)
+ var imageify = props.imageifyIdenticons === undefined ? true : props.imageifyIdenticons
// If it's not a contract deploy, send to the account
if (!isContractDeploy) {
return h(MiniAccountPanel, {
imageSeed: txParams.to,
- imageifyIdenticons: props.imageifyIdenticons,
+ imageifyIdenticons: imageify,
picOrder: 'left',
}, [
h('span.font-small', {
@@ -184,10 +185,9 @@ PTXP.miniAccountPanelForRecipient = function () {
},
}, addressSummary(txParams.to, 6, 4, false)),
])
-
} else {
return h(MiniAccountPanel, {
- imageifyIdenticons: props.imageifyIdenticons,
+ imageifyIdenticons: imageify,
picOrder: 'left',
}, [
@@ -224,7 +224,7 @@ PTXP.warnIfNeeded = function () {
}
-function forwardCarrat(imageify){
+function forwardCarrat (imageify) {
if (imageify) {
return (
@@ -250,4 +250,4 @@ function forwardCarrat(imageify){
)
}
-} \ No newline at end of file
+}
diff --git a/ui/lib/contract-namer.js b/ui/lib/contract-namer.js
index 62c7933e8..c99d44de6 100644
--- a/ui/lib/contract-namer.js
+++ b/ui/lib/contract-namer.js
@@ -13,7 +13,6 @@ module.exports = function(addr, identities = {}) {
const address = addr.toLowerCase()
const ids = hashFromIdentities(identities)
- console.dir({ addr, ids })
return addrFromHash(address, ids) || addrFromHash(address, nicknames)
}