From cca98a32c5025123e2f02152ff6d223ca31d75d9 Mon Sep 17 00:00:00 2001 From: Denis Davidyuk Date: Thu, 7 Nov 2019 16:27:08 +0100 Subject: [PATCH 1/5] NameNew: Fix auto expiration of names longer than 12 chars --- src/pages/mobile/NameNew.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/mobile/NameNew.vue b/src/pages/mobile/NameNew.vue index 167b2d2d9..f420fa8fd 100644 --- a/src/pages/mobile/NameNew.vue +++ b/src/pages/mobile/NameNew.vue @@ -48,7 +48,7 @@ diff --git a/src/store/modules/mobile.js b/src/store/modules/mobile.js index f4c28616c..684bd525a 100644 --- a/src/store/modules/mobile.js +++ b/src/store/modules/mobile.js @@ -8,6 +8,7 @@ export default { followers: {}, stepFraction: null, browserPath: '', + nameListRouteParams: { name: 'name-list-personal' }, readSecurityCourses: [], skipAddingToHomeScreen: false, }, @@ -39,6 +40,9 @@ export default { setBrowserPath(state, browserPath) { state.browserPath = browserPath; }, + setNameListRoute(state, nameListRouteParams) { + state.nameListRouteParams = nameListRouteParams; + }, markSecurityCourseAsRead(state, courseName) { if (state.readSecurityCourses.includes(courseName)) return; state.readSecurityCourses.push(courseName); diff --git a/src/store/plugins/ui/browserPathTracker.js b/src/store/plugins/ui/browserPathTracker.js deleted file mode 100644 index facdb1ff3..000000000 --- a/src/store/plugins/ui/browserPathTracker.js +++ /dev/null @@ -1,11 +0,0 @@ -export default (store) => { - store.watch( - ({ route }) => route, - ({ name, fullPath } = {}) => { - if (['apps', 'app-browser'].includes(name)) { - store.commit('setBrowserPath', fullPath); - } - }, - { immediate: true }, - ); -}; diff --git a/src/store/plugins/ui/index.js b/src/store/plugins/ui/index.js index b3ed87f3c..d8470983a 100644 --- a/src/store/plugins/ui/index.js +++ b/src/store/plugins/ui/index.js @@ -1,4 +1,4 @@ -import browserPathTracker from './browserPathTracker'; +import pathTracker from './pathTracker'; import connectionStatusTracker from './connectionStatusTracker'; import desktopGuide from './desktopGuide'; import languages from './languages'; @@ -21,7 +21,7 @@ export default store => [ veeValidate, ...process.env.IS_MOBILE_DEVICE ? [ - browserPathTracker, + pathTracker, notificationOnRemoteConnection, unlockWalletIfNotEncrypted, ] diff --git a/src/store/plugins/ui/pathTracker.js b/src/store/plugins/ui/pathTracker.js new file mode 100644 index 000000000..3102c441d --- /dev/null +++ b/src/store/plugins/ui/pathTracker.js @@ -0,0 +1,15 @@ +export default (store) => { + store.watch( + ({ route }) => route, + ({ name, fullPath, params } = {}) => { + if (['apps', 'app-browser'].includes(name)) { + store.commit('setBrowserPath', fullPath); + } else if ( + ['name-list', 'name-list-personal', 'name-list-character-length'].includes(name) + ) { + store.commit('setNameListRoute', { name, params }); + } + }, + { immediate: true }, + ); +}; From ef6139094bde426834cfaa217a84de2c2d2528e6 Mon Sep 17 00:00:00 2001 From: Nikita Cedrik Date: Fri, 8 Nov 2019 23:27:46 +1000 Subject: [PATCH 4/5] mobile: Add default to a browserPath --- src/components/mobile/TabBar.vue | 2 +- src/store/modules/mobile.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/mobile/TabBar.vue b/src/components/mobile/TabBar.vue index 45b5dfd49..b878d242f 100644 --- a/src/components/mobile/TabBar.vue +++ b/src/components/mobile/TabBar.vue @@ -5,7 +5,7 @@
{{ $t('app.title') }}
diff --git a/src/store/modules/mobile.js b/src/store/modules/mobile.js index 684bd525a..edc32f4f2 100644 --- a/src/store/modules/mobile.js +++ b/src/store/modules/mobile.js @@ -7,7 +7,7 @@ export default { state: { followers: {}, stepFraction: null, - browserPath: '', + browserPath: { name: 'apps' }, nameListRouteParams: { name: 'name-list-personal' }, readSecurityCourses: [], skipAddingToHomeScreen: false, From 329604eef33620f232cba44035e30fec03b42167 Mon Sep 17 00:00:00 2001 From: Nikita Cedrik Date: Fri, 8 Nov 2019 23:33:40 +1000 Subject: [PATCH 5/5] NameList: Decrease pagination padding --- src/pages/mobile/NameList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/mobile/NameList.vue b/src/pages/mobile/NameList.vue index d90536946..2951e1762 100644 --- a/src/pages/mobile/NameList.vue +++ b/src/pages/mobile/NameList.vue @@ -190,7 +190,7 @@ export default { text-align: center; span, a { - padding: 0 rem(10px); + padding: 0 rem(5px); } a {