aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHsuan Lee <hsuan@cobinhood.com>2018-11-13 14:37:26 +0800
committerHsuan Lee <hsuan@cobinhood.com>2018-12-10 18:51:42 +0800
commit5ced27f0c673f51344495cb9f11ba7d78ce8619b (patch)
tree1c9e4480386f691f3d8155eb7c07dab786f32d41
parent563569a1053549dff1b54091c8a9a721eeede816 (diff)
downloaddexon-wallet-5ced27f0c673f51344495cb9f11ba7d78ce8619b.tar.gz
dexon-wallet-5ced27f0c673f51344495cb9f11ba7d78ce8619b.tar.zst
dexon-wallet-5ced27f0c673f51344495cb9f11ba7d78ce8619b.zip
Fix notice scroll detection
-rw-r--r--CHANGELOG.md2
-rw-r--r--app/manifest.json2
-rw-r--r--ui/app/components/pages/notice.js2
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0fdc544..b3b3b3a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1205,6 +1205,8 @@ Made seed word restoring BIP44 compatible.
Added the ability to restore accounts from seed words.
## Current Master
+## 1.0.10 Tue Nov 13 2018
+
## 1.0.9 Mon Nov 12 2018
## 1.0.8 Mon Nov 12 2018
diff --git a/app/manifest.json b/app/manifest.json
index 0d6be883..4ebdd356 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "__MSG_appName__",
"short_name": "__MSG_appName__",
- "version": "1.0.9",
+ "version": "1.0.10",
"manifest_version": 2,
"author": "https://dexon.org",
"description": "__MSG_appDescription__",
diff --git a/ui/app/components/pages/notice.js b/ui/app/components/pages/notice.js
index 4a415287..c0b214a2 100644
--- a/ui/app/components/pages/notice.js
+++ b/ui/app/components/pages/notice.js
@@ -119,7 +119,7 @@ class Notice extends Component {
h('div.markdown', {
onScroll: (e) => {
var object = e.currentTarget
- if (object.offsetHeight + object.scrollTop + 100 >= object.scrollHeight) {
+ if ((object.offsetHeight * 2) + object.scrollTop >= object.scrollHeight) {
this.setState({ disclaimerDisabled: false })
}
},