aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-12-08 06:34:15 +0800
committerDan Finlay <dan@danfinlay.com>2016-12-17 02:55:42 +0800
commit851ba66cdd50aae8e2f9cb70fbed016990df2a2a (patch)
treee05a0e90bf48aebd3cb5a59c784a9ba1238532c5 /ui
parent8819475a2ed2ee7c34e983ebb5ab12661be1a961 (diff)
downloadtangerine-wallet-browser-851ba66cdd50aae8e2f9cb70fbed016990df2a2a.tar
tangerine-wallet-browser-851ba66cdd50aae8e2f9cb70fbed016990df2a2a.tar.gz
tangerine-wallet-browser-851ba66cdd50aae8e2f9cb70fbed016990df2a2a.tar.bz2
tangerine-wallet-browser-851ba66cdd50aae8e2f9cb70fbed016990df2a2a.tar.lz
tangerine-wallet-browser-851ba66cdd50aae8e2f9cb70fbed016990df2a2a.tar.xz
tangerine-wallet-browser-851ba66cdd50aae8e2f9cb70fbed016990df2a2a.tar.zst
tangerine-wallet-browser-851ba66cdd50aae8e2f9cb70fbed016990df2a2a.zip
Add ability to show notices to user & get confirmation.
Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition.
Diffstat (limited to 'ui')
-rw-r--r--ui/app/actions.js2
-rw-r--r--ui/app/app.js4
2 files changed, 5 insertions, 1 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js
index 7bf39081a..07df5ada2 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -533,7 +533,7 @@ function goBackToInitView () {
function markNoticeRead (notice) {
return (dispatch) => {
dispatch(this.showLoadingIndication())
- background.markNoticeRead(notice, (err, notice) => {
+ _accountManager.markNoticeRead(notice, (err, notice) => {
dispatch(this.hideLoadingIndication())
if (err) {
return dispatch(actions.showWarning(err))
diff --git a/ui/app/app.js b/ui/app/app.js
index 422b3739c..aa0b814d2 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -432,6 +432,10 @@ App.prototype.renderPrimary = function () {
return h(NoticeScreen, {key: 'NoticeScreen'})
}
+ if (!props.noActiveNotices) {
+ return h(NoticeScreen, {key: 'NoticeScreen'})
+ }
+
// show current view
switch (props.currentView.name) {
case 'EthStoreWarning':