aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-11-30 05:34:19 +0800
committerDan Finlay <dan@danfinlay.com>2017-11-30 05:34:19 +0800
commitadc66974ff6c14988945ddc93e56e5030ba144d1 (patch)
treead931915aa85704c76c9a6f2fe73b2b454682837
parent9ca6f93ecae53d59e61c4dd777558ebde24a49ee (diff)
downloadtangerine-wallet-browser-adc66974ff6c14988945ddc93e56e5030ba144d1.tar
tangerine-wallet-browser-adc66974ff6c14988945ddc93e56e5030ba144d1.tar.gz
tangerine-wallet-browser-adc66974ff6c14988945ddc93e56e5030ba144d1.tar.bz2
tangerine-wallet-browser-adc66974ff6c14988945ddc93e56e5030ba144d1.tar.lz
tangerine-wallet-browser-adc66974ff6c14988945ddc93e56e5030ba144d1.tar.xz
tangerine-wallet-browser-adc66974ff6c14988945ddc93e56e5030ba144d1.tar.zst
tangerine-wallet-browser-adc66974ff6c14988945ddc93e56e5030ba144d1.zip
Add markdown class to mascara ui markdown field
-rw-r--r--mascara/src/app/first-time/notice-screen.js2
-rw-r--r--test/integration/lib/mascara-first-time.js7
2 files changed, 5 insertions, 4 deletions
diff --git a/mascara/src/app/first-time/notice-screen.js b/mascara/src/app/first-time/notice-screen.js
index 713f3f242..d09070a95 100644
--- a/mascara/src/app/first-time/notice-screen.js
+++ b/mascara/src/app/first-time/notice-screen.js
@@ -64,7 +64,7 @@ class NoticeScreen extends Component {
<Identicon address={address} diameter={70} />
<div className="tou__title">{title}</div>
<Markdown
- className="tou__body"
+ className="tou__body markdown"
source={body}
skipHtml
/>
diff --git a/test/integration/lib/mascara-first-time.js b/test/integration/lib/mascara-first-time.js
index c43f99b29..da649803a 100644
--- a/test/integration/lib/mascara-first-time.js
+++ b/test/integration/lib/mascara-first-time.js
@@ -141,14 +141,15 @@ async function skipNotices (app) {
if (button && button.html() === 'Accept') {
// still notices to accept
const termsPage = app.find('.markdown')[0]
+ if (!termsPage) {
+ debugger
+ break
+ }
termsPage.scrollTop = termsPage.scrollHeight
await timeout()
- console.log('Clearing notice')
button.click()
await timeout()
} else {
- console.dir(button)
- // exit loop
console.log('No more notices...')
break
}