Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ragger: bump version to v1.18.0 #103

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Ragger: bump version to v1.18.0 #103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions test/utils/navigator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@

from ragger.backend import BackendInterface
from ragger.firmware import Firmware
from ragger.firmware.stax.screen import MetaScreen
from ragger.firmware.stax.layouts import ChoiceList
from ragger.firmware.stax.use_cases import (
from ragger.firmware.touch.screen import MetaScreen
from ragger.firmware.touch.layouts import ChoiceList, TappableCenter
from ragger.firmware.touch.use_cases import (
UseCaseHome,
UseCaseSettings,
UseCaseReview,
UseCaseAddressConfirmation
)
from ragger.firmware.stax.positions import CENTER
from ragger.firmware.touch.positions import Position
from ragger.navigator import Navigator, NavInsID, NavIns

from common import TESTS_ROOT_DIR, EMPTY_PATH
Expand Down Expand Up @@ -66,15 +66,23 @@ def send_and_navigate(send: Callable[[], RESPONSE], navigate: Callable[[], None]

return result

class TezosUseCaseAddressConfirmation(UseCaseAddressConfirmation):
class TezosUseCaseAddressConfirmation(UseCaseAddressConfirmation, metaclass=MetaScreen):
"""Extension of UseCaseAddressConfirmation for our app."""

# Y-285 = common space shared by buttons under a key displayed on 2 or 3 lines
SHOW_QR = (CENTER.x, 285)
layout_tappable_center = TappableCenter

def show_qr(self):
tappable_center: TappableCenter

@property
def qr_position(self) -> Position:
"""Position of the qr code.
Y-285 = common space shared by buttons under a key displayed on 2 or 3 lines
"""
return Position(self.tappable_center.positions.x, 285)

def show_qr(self) -> None:
"""Tap to show qr code."""
self.client.finger_touch(*TezosUseCaseAddressConfirmation.SHOW_QR)
self.client.finger_touch(*self.qr_position)


APP_CONTEXT = Path("app_context")
Expand All @@ -86,7 +94,7 @@ class TezosNavigator(metaclass=MetaScreen):
use_case_home = UseCaseHome
use_case_settings = UseCaseSettings
use_case_review = UseCaseReview
use_case_provide_pk = UseCaseAddressConfirmation
use_case_provide_pk = TezosUseCaseAddressConfirmation
layout_choice_list = ChoiceList

home: UseCaseHome
Expand Down Expand Up @@ -339,7 +347,7 @@ def accept_key_navigate(self, **kwargs):
self.navigate_and_compare(
navigate_instruction = NavInsID.USE_CASE_ADDRESS_CONFIRMATION_TAP,
validation_instructions = [
NavIns(NavInsID.TOUCH, TezosUseCaseAddressConfirmation.SHOW_QR),
NavIns(NavInsID.TOUCH, self.provide_pk.qr_position),
NavInsID.USE_CASE_ADDRESS_CONFIRMATION_EXIT_QR,
NavInsID.USE_CASE_CHOICE_CONFIRM,
NavInsID.USE_CASE_STATUS_DISMISS
Expand Down
Loading