Skip to content

Commit

Permalink
v1.0.0 (#15)
Browse files Browse the repository at this point in the history
* rename tests

* add app icons

* improve UI steps

* v1.0.0

* update changelog
  • Loading branch information
Thegaram authored Dec 19, 2021
1 parent d0044a2 commit 652ef2e
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .doxygen/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places.
# The default value is: My Project.

PROJECT_NAME = "Boilerplate"
PROJECT_NAME = "Conflux"

# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
# could be handy for archiving the generated documentation or if some version
Expand Down
2 changes: 1 addition & 1 deletion .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"USB_SEGMENT_SIZE=64",
"UNUSED(x)=(void)x",
"APPVERSION=\"1.0.0\"",
"APPNAME=\"Boilerplate\"",
"APPNAME=\"Conflux\"",
"MAJOR_VERSION=1",
"MINOR_VERSION=0",
"PATCH_VERSION=0",
Expand Down
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ 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.0.0] - 2020-11-19
## [1.0.0] - 2021-12-19

### Added

- Inital commit with the brand new Boilerplate application
- Initial implementation of the brand new Conflux application.
- This version supports the following commands: `GET_APP_INFO`, `GET_PUBLIC_KEY`, `SIGN_TX`, `SIGN_PERSONAL`.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ APP_LOAD_PARAMS += --path "44'/503'"
APP_LOAD_PARAMS += $(COMMON_LOAD_PARAMS)

APPNAME = "Conflux"
APPVERSION_M = 0
APPVERSION_M = 1
APPVERSION_N = 0
APPVERSION_P = 3
APPVERSION_P = 0
APPVERSION = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)"

ifeq ($(TARGET_NAME),TARGET_NANOX)
ICONNAME=icons/nanox_app_boilerplate.gif
ICONNAME=icons/nanox_app_conflux.gif
else
ICONNAME=icons/nanos_app_boilerplate.gif
ICONNAME=icons/nanos_app_conflux.gif
endif

all: default
Expand Down
Binary file removed icons/nanos_app_boilerplate.gif
Binary file not shown.
Binary file added icons/nanos_app_conflux.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed icons/nanox_app_boilerplate.gif
Binary file not shown.
Binary file added icons/nanox_app_conflux.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 11 additions & 8 deletions src/ui/steps.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ UX_STEP_NOCB(ux_step_get_pubkey_start,
});

UX_STEP_NOCB(ux_step_get_pubkey_display_path,
bnnn_paging,
bn,
{
.title = "Path",
.text = strings.get_pubkey.bip32_path,
"Path",
strings.get_pubkey.bip32_path,
});

UX_STEP_NOCB(ux_step_get_pubkey_display_address,
Expand Down Expand Up @@ -189,17 +189,20 @@ UX_STEP_CB(ux_step_back,
});

UX_STEP_CB(ux_step_settings_blind_sign,
bnnn_paging,
bn,
ui_action_toggle_settings_blind_signing(),
{
.title = "Blind signing",
.text = strings.settings.blind_signing,
"Blind signing",
strings.settings.blind_signing,
});

UX_STEP_CB(ux_step_settings_display_style,
bnnn_paging,
bn,
ui_action_toggle_settings_detailed_display(),
{.title = "Display style", .text = strings.settings.display_style});
{
"Display style",
strings.settings.display_style,
});

UX_STEP_NOCB(ux_step_menu_ready,
pnn,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
def test_get_app_info(cmd):
_, _, MAJOR, MINOR, PATCH = cmd.get_app_info()
assert (MAJOR, MINOR, PATCH) == (0, 0, 3)
assert (MAJOR, MINOR, PATCH) == (1, 0, 0)
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 652ef2e

Please sign in to comment.