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

E2E transaction appears in history 

Signed-off-by: Serhy <sergii@status.im>
This commit is contained in:
Serhy 2019-10-28 10:00:03 +02:00
parent 5561aff955
commit eb00df147d
No known key found for this signature in database
GPG Key ID: 5D7C4B9E2B6F500B
4 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/status_im/ui/screens/profile/components/sheets.cljs
View File

@ -40,5 +40,6 @@
(i18n/label :t/block-contact-details)] (i18n/label :t/block-contact-details)]
[list-item/list-item [list-item/list-item
{:theme :action-destructive {:theme :action-destructive
:accessibility-label :block-contact-confirm
:title :t/block-contact :title :t/block-contact
:on-press #(hide-sheet-and-dispatch [:contact.ui/block-contact-confirmed public-key])}]])) :on-press #(hide-sheet-and-dispatch [:contact.ui/block-contact-confirmed public-key])}]]))

1
src/status_im/ui/screens/wallet/accounts/sheets.cljs
View File

@ -68,6 +68,7 @@
[list-item/list-item [list-item/list-item
{:theme :action {:theme :action
:title :t/account-settings :title :t/account-settings
:accessibility-label :account-settings-bottom-sheet
:icon :main-icons/info :icon :main-icons/info
:on-press #(hide-sheet-and-dispatch [:navigate-to :account-settings])}] :on-press #(hide-sheet-and-dispatch [:navigate-to :account-settings])}]
;; Commented out for v1 ;; Commented out for v1

33
test/appium/tests/atomic/transactions/test_wallet.py
View File

@ -120,34 +120,21 @@ class TestTransactionWalletSingleDevice(SingleDeviceTestCase):
if send_transaction.element_by_text_part('Transaction sent').is_element_displayed(): if send_transaction.element_by_text_part('Transaction sent').is_element_displayed():
self.driver.fail('Transaction was sent with a wrong password') self.driver.fail('Transaction was sent with a wrong password')
@marks.testrail_id(1452) @marks.testrail_id(6236)
@marks.medium
def test_transaction_appears_in_history(self): def test_transaction_appears_in_history(self):
recipient = basic_user
sign_in_view = SignInView(self.driver) sign_in_view = SignInView(self.driver)
sign_in_view.create_user() home_view = sign_in_view.create_user()
home_view = sign_in_view.get_home_view()
transaction_amount = home_view.get_unique_amount()
sender_public_key = home_view.get_public_key()
sender_address = home_view.public_key_to_address(sender_public_key)
home_view.home_button.click()
self.network_api.get_donate(sender_address)
wallet_view = home_view.wallet_button.click() wallet_view = home_view.wallet_button.click()
wallet_view.set_up_wallet() wallet_view.set_up_wallet()
wallet_view.wait_balance_changed_on_wallet_screen() address = wallet_view.get_wallet_address()[2:]
send_transaction = wallet_view.send_transaction_button.click() self.network_api.get_donate(address)
send_transaction.amount_edit_box.click() recipient = "0x"+basic_user['address']
send_transaction.amount_edit_box.set_value(transaction_amount) sending_amount = "0.08"
send_transaction.confirm() wallet_view.send_transaction(asset_name='ETHro', amount=sending_amount, recipient=recipient, sign_transaction=True)
send_transaction.chose_recipient_button.click()
send_transaction.enter_recipient_address_button.click()
send_transaction.enter_recipient_address_input.set_value(recipient['address'])
send_transaction.done_button.click()
send_transaction.sign_transaction_button.click()
send_transaction.sign_transaction()
self.network_api.find_transaction_by_unique_amount(recipient['address'], transaction_amount)
transactions_view = wallet_view.transaction_history_button.click() transactions_view = wallet_view.transaction_history_button.click()
transactions_view.transactions_table.find_transaction(amount=transaction_amount) transactions_view.transactions_table.find_transaction(amount=sending_amount)
transactions_view.transactions_table.find_transaction(amount="0.1")
@marks.testrail_id(5461) @marks.testrail_id(5461)
@marks.medium @marks.medium

2
test/appium/views/chat_view.py
View File

@ -125,7 +125,7 @@ class ClearButton(BaseButton):
class BlockContactButton(BaseButton): class BlockContactButton(BaseButton):
def __init__(self, driver): def __init__(self, driver):
super(BlockContactButton, self).__init__(driver) super(BlockContactButton, self).__init__(driver)
self.locator = self.Locator.accessibility_id('block-contact') self.locator = self.Locator.accessibility_id('block-contact-confirm')
class UnblockContactButton(BaseButton): class UnblockContactButton(BaseButton):