Skip to content

Commit

Permalink
[#8968] custom seed phrase popover
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmitryn
dmitryn committed Sep 24, 2019
1 parent 9954ee6 commit 6f0c819
Show file tree
Hide file tree
Showing 6 changed files with 149 additions and 55 deletions.
18 changes: 15 additions & 3 deletions src/status_im/multiaccounts/recover/core.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
[status-im.multiaccounts.create.core :as multiaccounts.create]
[status-im.multiaccounts.db :as db]
[status-im.native-module.core :as status]
[status-im.popover.core :as popover]
[status-im.ui.screens.navigation :as navigation]
[status-im.utils.fx :as fx]
[status-im.utils.security :as security]
Expand Down Expand Up @@ -153,9 +154,20 @@
{:events [::enter-phrase-input-submitted ::enter-phrase-next-pressed]}
[{:keys [db] :as cofx}]
(let [{:keys [password passphrase]} (:multiaccounts/recover db)]
(when (mnemonic/valid-length? passphrase)
{::import-multiaccount {:passphrase passphrase
:password password}})))
(if (check-phrase-warnings passphrase)
(popover/show-popover cofx {:view :custom-seed-phrase})
(when (mnemonic/valid-length? passphrase)
{::import-multiaccount {:passphrase passphrase
:password password}}))))

(fx/defn continue-to-import-mnemonic
{:events [::continue-pressed]}
[{:keys [db] :as cofx}]
(let [{:keys [password passphrase]} (:multiaccounts/recover db)]
(fx/merge cofx
{::import-multiaccount {:passphrase passphrase
:password password}}
(popover/hide-popover))))

(fx/defn cancel-pressed
{:events [::cancel-pressed]}
Expand Down
50 changes: 48 additions & 2 deletions src/status_im/ui/screens/multiaccounts/recover/views.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,44 @@
[status-im.utils.utils :as utils]
[status-im.constants :as constants]
[status-im.ui.components.list-item.views :as list-item]
[status-im.utils.platform :as platform]))
[status-im.utils.platform :as platform]
[status-im.react-native.resources :as resources]
[status-im.ui.components.icons.vector-icons :as icons]
[status-im.ui.components.button :as button]))

(defview custom-seed-phrase []
[react/view
[react/view {:margin-top 24 :margin-horizontal 24 :align-items :center}
[react/view {:width 32 :height 32 :border-radius 16
:align-items :center :justify-content :center}
[icons/icon :main-icons/help {:color colors/blue}]]
[react/text {:style {:typography :title-bold
:margin-top 8
:margin-bottom 8}}
(i18n/label :t/custom-seed-phrase)]
[react/view {:flex-wrap :wrap
:flex-direction :row
:justify-content :center
:text-align :center}
[react/nested-text
{:style {:color colors/gray
:text-align :center
:line-height 22}}
(i18n/label :t/custom-seed-phrase-text-1)
[{:style {:color colors/black}}
(i18n/label :t/custom-seed-phrase-text-2)]
(i18n/label :t/custom-seed-phrase-text-3)
[{:style {:color colors/black}}
(i18n/label :t/custom-seed-phrase-text-4)]]]
[react/view {:margin-vertical 24
:align-items :center}
[button/button {:on-press #(re-frame/dispatch [::multiaccounts.recover/continue-pressed])
:accessibility-label :continue-custom-seed-phrase
:label (i18n/label :t/continue)}]
[button/button {:on-press #(re-frame/dispatch [:hide-popover])
:accessibility-label :cancel-custom-seed-phrase
:type :secondary
:label (i18n/label :t/cancel)}]]]])

(defn bottom-sheet-view []
[react/view {:flex 1 :flex-direction :row}
Expand All @@ -37,7 +74,16 @@
:title :t/recover-with-keycard
:disabled? (not config/hardwallet-enabled?)
:accessibility-label :recover-with-keycard-button
:icon :main-icons/keycard-logo
:icon [react/view {:border-width 1
:border-radius 20
:border-color colors/blue-light
:background-color colors/blue-light
:justify-content :center
:align-items :center
:width 40
:height 40}
[react/image {:source (resources/get-image :keycard-logo-blue)
:style {:width 24 :height 24}}]]
:on-press #(re-frame/dispatch [::hardwallet/recover-with-keycard-pressed])}])]])

(def bottom-sheet
Expand Down
6 changes: 5 additions & 1 deletion src/status_im/ui/screens/popover/views.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
[re-frame.core :as re-frame]
[status-im.ui.screens.wallet.signing-phrase.views :as signing-phrase]
[status-im.ui.screens.wallet.request.views :as request]
[status-im.ui.screens.profile.user.views :as profile.user]))
[status-im.ui.screens.profile.user.views :as profile.user]
[status-im.ui.screens.multiaccounts.recover.views :as multiaccounts.recover]))

(defn hide-panel-anim
[bottom-anim-value alpha-value window-height]
Expand Down Expand Up @@ -98,6 +99,9 @@
(= :share-chat-key view)
[profile.user/share-chat-key]

(= :custom-seed-phrase view)
[multiaccounts.recover/custom-seed-phrase]

:else
[view])]]]]])))})))

Expand Down
109 changes: 61 additions & 48 deletions test/appium/tests/atomic/account_management/test_recover.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from tests.base_test_case import SingleDeviceTestCase
from tests.users import basic_user, transaction_senders, recovery_users
from views.sign_in_view import SignInView
from views.recover_access_view import RecoverAccessView


@marks.all
Expand Down Expand Up @@ -71,78 +72,90 @@ class TestRecoverAccessFromSignInScreen(SingleDeviceTestCase):
@marks.high
def test_pass_phrase_validation(self):
signin_view = SignInView(self.driver)
recover_access_view = signin_view.access_key_button.click()

phrase_outside_the_mnemonic = 'one two three four five six seven eight nine ten eleven twelve'
signin_view.access_key_button.click()
recover_access_view = RecoverAccessView(self.driver)
validations = [
# empty value
{
'phrase': ' ',
'element to check': recover_access_view.warnings.required_field,
'element to check': recover_access_view.warnings.invalid_recovery_phrase,
'validation message': 'Required field',
'words count': 1,
'popup': False
},
# invalid seed phrase
{
'phrase': 'a',
'element to check': recover_access_view.warnings.invalid_recovery_phrase,
'validation message': 'Recovery phrase is invalid'
},
{
'phrase': 'one two three four five six seven eight nine ten eleven twelve thirteen',
'element to check': recover_access_view.warnings.invalid_recovery_phrase,
'validation message': 'Recovery phrase is invalid'
'validation message': 'Seed phrase is invalid',
'words count': 1,
'popup' : False
},
# outside mnemonic
{
'phrase': '; two three four five six seven eight nine ten eleven twelve',
'element to check': recover_access_view.warnings.invalid_recovery_phrase,
'validation message': 'Recovery phrase is invalid'
},
{
'phrase': phrase_outside_the_mnemonic,
'element to check': recover_access_view.warnings.misspelled_words,
'validation message': 'Some words might be misspelled'
'validation message': '',
'words count': 12,
'popup': True
},
]

# check that seed phrase is required (can't be empty)
recover_access_view.enter_seed_phrase_button.click()
recover_access_view.next_button.click()
if recover_access_view.reencrypt_your_key_button.is_element_displayed():
self.errors.append("Possible to create account with empty seed phrase")

# we're performing the same steps changing only phrase per attempt
for validation in validations:
phrase, elm, msg = validation.get('phrase'), validation.get('element to check'), validation.get(
'validation message')
phrase, elm, msg, words_count, popup = validation.get('phrase'), \
validation.get('element to check'), \
validation.get('validation message'), \
validation.get('words count'),\
validation.get('popup')
if signin_view.access_key_button.is_element_displayed():
signin_view.access_key_button.click()
if recover_access_view.enter_seed_phrase_button.is_element_displayed():
recover_access_view.enter_seed_phrase_button.click()

recover_access_view.send_as_keyevent(phrase)
recover_access_view.next_button.click()

if not elm.is_element_displayed():
self.errors.append('"{}" message is not shown'.format(msg))
recover_access_view.click_system_back_button()

signin_view.access_key_button.click()
recover_access_view.enter_seed_phrase_button.click()
recover_access_view.send_as_keyevent(phrase_outside_the_mnemonic)
recover_access_view.next_button.click()
recover_access_view.recover_account_password_input.click()
recover_access_view.send_as_keyevent('123456')
recover_access_view.sign_in_button.click()
recover_access_view.cancel_button.click()

if recover_access_view.cancel_button.is_element_displayed():
self.errors.append('Something went wrong. Probably, the confirmation pop up did not disappear')

recover_access_view.click_system_back_button()

signin_view.access_key_button.click()
recover_access_view.enter_seed_phrase_button.click()
recover_access_view.send_as_keyevent(phrase_outside_the_mnemonic)
recover_access_view.next_button.click()
recover_access_view.recover_account_password_input.click()
recover_access_view.send_as_keyevent('123456')
recover_access_view.sign_in_button.click()
home_view = recover_access_view.confirm_phrase_button.click()

if not home_view.profile_button.is_element_displayed():
self.errors.append('Something went wrong. Probably, could not reach the home screen out.')
# TODO: uncomment after 8567 fix
#if msg and not elm.is_element_displayed():
# self.errors.append('"{}" message is not shown'.format(msg))

# check that words count is shown
if words_count == 1:
if not signin_view.element_by_text('%s word' % words_count):
self.errors.append('"%s word" is not shown ' % words_count)
else:
if not signin_view.element_by_text('%s words' % words_count):
self.errors.append('"%s words" is not shown ' % words_count)

# check that "Next" is disabled unless we use allowed count of words
if words_count != 12 or 15 or 18 or 21 or 24:
recover_access_view.next_button.click()
if recover_access_view.reencrypt_your_key_button.is_element_displayed():
self.errors.append("Possible to create account with wrong count (%s) of words" % words_count)

# check behavior for popup "Custom seed phrase"
if popup:
text = 'some words are misspelled.'
common_password = 'qwerty'
if not recover_access_view.find_full_text(text):
self.errors.append('"%s" text is not shown' % text)
recover_access_view.cancel_custom_seed_phrase_button.click()
recover_access_view.next_button.click()
recover_access_view.continue_custom_seed_phrase_button.click()
recover_access_view.reencrypt_your_key_button.click()
recover_access_view.next_button.click()
recover_access_view.create_password_input.set_value(common_password)
recover_access_view.next_button.click()
recover_access_view.confirm_your_password_input.set_value(common_password)
recover_access_view.next_button.click_until_presence_of_element(recover_access_view.home_button)
else:
recover_access_view.click_system_back_button()

self.verify_no_errors()

Expand Down
14 changes: 14 additions & 0 deletions test/appium/views/recover_access_view.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,18 @@ def __init__(self, driver):
super(ConfirmRecoverAccess, self).__init__(driver)
self.locator = self.Locator.xpath_selector("//android.widget.TextView[@text='RECOVER ACCESS']")

class ContinueCustomSeedPhraseButton(BaseButton):

def __init__(self, driver):
super(ContinueCustomSeedPhraseButton, self).__init__(driver)
self.locator = self.Locator.accessibility_id("continue-custom-seed-phrase")

class CancelCustomSeedPhraseButton(BaseButton):

def __init__(self, driver):
super(CancelCustomSeedPhraseButton, self).__init__(driver)
self.locator = self.Locator.accessibility_id("cancel-custom-seed-phrase")


class RequiredField(BaseElement):
def __init__(self, driver):
Expand Down Expand Up @@ -92,3 +104,5 @@ def __init__(self, driver):
self.warnings = Warnings(self.driver)
self.confirm_phrase_button = ConfirmPhraseButton(self.driver)
self.cancel_button = CancelPhraseButton(self.driver)
self.continue_custom_seed_phrase_button = ContinueCustomSeedPhraseButton(self.driver)
self.cancel_custom_seed_phrase_button = CancelCustomSeedPhraseButton(self.driver)
7 changes: 6 additions & 1 deletion translations/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1094,5 +1094,10 @@
"your-data-belongs-to-you": "If you lose your seed phrase you lose your data and funds",
"your-data-belongs-to-you-description": "Status can’t help you recover your multiaccount if you lose your seed phrase. You are in charge of the security of your data, and backing up your seed phrase is the best safeguard.",
"your-recovery-phrase": "Your seed phrase",
"your-recovery-phrase-description": "This is your seed phrase. You use it to prove that this is your wallet. You only get to see it once! Write it on paper and keep it in a secure place. You will need it if you lose or reinstall your wallet."
"your-recovery-phrase-description": "This is your seed phrase. You use it to prove that this is your wallet. You only get to see it once! Write it on paper and keep it in a secure place. You will need it if you lose or reinstall your wallet.",
"custom-seed-phrase": "Custom seed phrase",
"custom-seed-phrase-text-1": "This looks like a custom seed phrase and doesn't match the Status dictionary. This could also mean ",
"custom-seed-phrase-text-2": "some words are misspelled.",
"custom-seed-phrase-text-3": " If so, you'll end up creating a",
"custom-seed-phrase-text-4": " new account"
}

0 comments on commit 6f0c819

Please sign in to comment.