Skip to content

Commit

Permalink
Merge pull request #189 from LedgerHQ/fbe/move_review_tap_on_stax
Browse files Browse the repository at this point in the history
Move review.tap coordinates on Stax from center to center left to avoid clicking on QR code button
  • Loading branch information
fbeutin-ledger authored Jun 19, 2024
2 parents 5774682 + 2fd05bd commit 9125126
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_and_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
pip install -U click>=8
- name: Download app binaries
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: boilerplate_binaries
path: ./build/
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Generate the documentation
run: (cd doc && make html)
- name: Upload documentation bundle
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: documentation
path: doc/build/html/
Expand All @@ -46,9 +46,9 @@ jobs:
if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))
steps:
- name: Download documentation bundle
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
- name: Deploy documentation on pages
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: documentation/
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ build/
dist/
__version__.py

tests/elfs/
snapshots-tmp/
tests/snapshots-tmp/
ledger_app.toml

# doc
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.20.1] - 2024-06-19

### Fixed
- navigator: Moved review.tap coordinates on Stax from center to center left to avoid clicking on QR code button

## [1.20.0] - 2024-05-31

### Added
Expand Down
3 changes: 2 additions & 1 deletion src/ragger/firmware/touch/positions.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def __iter__(self):

# Stax resolution is 400x670
STAX_CENTER = Position(200, 335)
STAX_CENTER_LEFT = Position(200, 40)
# Flex resolution is 480x600
FLEX_CENTER = Position(240, 300)

Expand Down Expand Up @@ -468,7 +469,7 @@ def __iter__(self):
},
"UseCaseReview": {
Firmware.STAX: {
"tap": STAX_CENTER,
"tap": STAX_CENTER_LEFT,
"previous": STAX_BUTTON_UPPER_LEFT,
"confirm": STAX_BUTTON_ABOVE_LOWER_MIDDLE,
"reject": STAX_BUTTON_LOWER_MIDDLE,
Expand Down
Binary file modified tests/snapshots/flex/waiting_screen/00000.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/snapshots/flex/waiting_screen/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/snapshots/flex/waiting_screen/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/snapshots/flex/waiting_screen/00004.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9125126

Please sign in to comment.