diff options
author | TrejGun <trejgun@gmail.com> | 2018-07-05 11:34:13 +0800 |
---|---|---|
committer | TrejGun <trejgun@gmail.com> | 2018-07-05 11:34:13 +0800 |
commit | 94d1d846fb57932fd1e959f53dbf6444f0789e91 (patch) | |
tree | 369276cd66bdcae85cac77b2c9b2458de5b08dd7 /old-ui/app/app.js | |
parent | c94f639de55a867ebe8d3599d337a1f7341b1979 (diff) | |
parent | fd218142acb6dab0b2f921b9729f17ff90cffc2d (diff) | |
download | tangerine-wallet-browser-94d1d846fb57932fd1e959f53dbf6444f0789e91.tar.gz tangerine-wallet-browser-94d1d846fb57932fd1e959f53dbf6444f0789e91.tar.zst tangerine-wallet-browser-94d1d846fb57932fd1e959f53dbf6444f0789e91.zip |
Merge branch 'develop' into contextTypes
# Conflicts:
# ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
Diffstat (limited to 'old-ui/app/app.js')
-rw-r--r-- | old-ui/app/app.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/old-ui/app/app.js b/old-ui/app/app.js index 5c2dccc03..0637e3b5b 100644 --- a/old-ui/app/app.js +++ b/old-ui/app/app.js @@ -183,6 +183,7 @@ App.prototype.renderAppBar = function () { this.setState({ isNetworkMenuOpen: !isNetworkMenuOpen }) }, }), + ]), props.isUnlocked && h('div', { |