status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

access-id + start new chat fix 

Signed-off-by: Churikova Tetiana <churikova.tm@gmail.com>
This commit is contained in:
Churikova Tetiana 2020-03-03 13:47:03 +01:00
parent f5488e1f61
commit 4d0fd4389e
No known key found for this signature in database
GPG Key ID: 0D4EA7B33B47E6D8
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/status_im/ui/screens/add_new/new_chat/views.cljs
View File

@ -66,7 +66,8 @@
[topbar/topbar [topbar/topbar
{:title :t/new-chat {:title :t/new-chat
:modal? true :modal? true
:accessories [{:icon :qr :accessories [{:icon :qr
:accessibility-label :scan-contact-code-button
:handler #(re-frame/dispatch [:qr-scanner.ui/scan-qr-code-pressed :handler #(re-frame/dispatch [:qr-scanner.ui/scan-qr-code-pressed
{:title (i18n/label :t/new-contact) {:title (i18n/label :t/new-contact)
:handler :contact/qr-code-scanned}])}]}] :handler :contact/qr-code-scanned}])}]}]

2
test/appium/tests/atomic/chats/test_chats_management.py
View File

@ -133,7 +133,7 @@ class TestChatManagement(SingleDeviceTestCase):
contacts_view = home.start_new_chat_button.click() contacts_view = home.start_new_chat_button.click()
contacts_view.public_key_edit_box.set_value(basic_user['public_key'][:-1]) contacts_view.public_key_edit_box.set_value(basic_user['public_key'][:-1])
contacts_view.confirm() contacts_view.confirm()
warning_text = contacts_view.element_by_text('Please enter or scan a valid chat key or username') warning_text = contacts_view.element_by_text('User not found')
if not warning_text.is_element_displayed(): if not warning_text.is_element_displayed():
self.driver.fail('Error is not shown for invalid public key') self.driver.fail('Error is not shown for invalid public key')

2
test/appium/tests/atomic/chats/test_one_to_one.py
View File

@ -170,7 +170,7 @@ class TestMessagesOneToOneChatMultiple(MultipleDeviceTestCase):
default_username_2 = profile_2.default_username_text.text default_username_2 = profile_2.default_username_text.text
profile_2.home_button.click() profile_2.home_button.click()
device_1_chat = device_1_home.add_contact(device_2_public_key) device_1_chat = device_1_home.add_contact(device_2_public_key + ' ')
message = 'hello' message = 'hello'
device_1_chat.chat_message_input.send_keys(message) device_1_chat.chat_message_input.send_keys(message)
device_1_chat.send_message_button.click() device_1_chat.send_message_button.click()