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

Fix/resolve merge issue #31

Merged
15 commits merged into from
Dec 31, 2024
Merged

Fix/resolve merge issue #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
da0fe50
Fixed icons having an alpha layer
apaillier-ledger Oct 26, 2023
65e72fd
Added a 64x64px Stax glyph
apaillier-ledger Oct 26, 2023
cba4d50
Removed unused glyphs
apaillier-ledger Oct 25, 2023
a6670fc
Updated to use the latest plugin SDK
apaillier-ledger Oct 25, 2023
59ab670
Merge pull request #1 from LedgerHQ/fix/apa/plugin_sdk_update
apaillier-ledger Oct 26, 2023
15b14f8
Merge pull request #2 from LedgerHQ/develop
apaillier-ledger Oct 30, 2023
d6ab999
[auto]: add PR template
sgliner-ledger Nov 29, 2023
0af3917
[auto] Add manifest
sgliner-ledger Mar 13, 2024
17d08de
Merge remote-tracking branch 'ledger/develop' into fix/resolve-merge-…
Z4karia May 31, 2024
3626abe
update sdk
Z4karia Jun 3, 2024
9b1e707
fix build issues + lint
Z4karia Jun 3, 2024
18d7af4
ci: recurse submodules when cloning app-eth
Z4karia Jun 3, 2024
845482a
fix function types
Z4karia Jun 3, 2024
41a43ab
fix ui function calls
Z4karia Jun 3, 2024
fcb6058
chore: update app version to 1.2.2
Z4karia Jun 3, 2024
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
1 change: 0 additions & 1 deletion .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ SortIncludes: false
SpaceAfterCStyleCast: true
AllowShortCaseLabelsOnASingleLine: false
AllowAllArgumentsOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Never
AllowShortFunctionsOnASingleLine: None
BinPackArguments: false
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ jobs:
with:
repository: LedgerHQ/app-ethereum
ref: ${{ ((github.base_ref || github.ref_name) == 'main' && 'master') || (github.base_ref || github.ref_name) }}
submodules: true

- name: Build
run: |
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ APPNAME = "StakeKit"
# Application version
APPVERSION_M = 1
APPVERSION_N = 2
APPVERSION_P = 1
APPVERSION_P = 2

include ethereum-plugin-sdk/standard_plugin.mk
2 changes: 1 addition & 1 deletion ethereum-plugin-sdk
Open in desktop
Submodule ethereum-plugin-sdk updated 9 files
+106 −0 .github/workflows/_reusable_build_with_submodule_injection.yml
+49 −0 .github/workflows/build_and_test.yml
+23 −1 CHANGELOG.md
+0 −14 README.md
+4 −1 src/asset_info.h
+21 −10 src/common_utils.c
+14 −3 src/common_utils.h
+1 −1 src/main.c
+3 −1 standard_plugin.mk
Loading
Loading