Merge branch 'master' into remove_v_check

2021-08-11 11:20:23 +02:00
parent c8bad8b2f8 0d1d50857d
commit de5830b494
5 changed files with 11 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).

+## [1.9.1](https://github.com/ledgerhq/app-ethereum/compare/1.8.8...1.9.1) - 2021-8-06
+
+### Added
+
+- Fix BSC app icons.
+- Fix tokens for Theta app.
+
 ## [1.9.0](https://github.com/ledgerhq/app-ethereum/compare/1.8.8...1.9.0) - 2021-8-05

 ### Added
--- a/2
+++ b/2
@@ -31,7 +31,7 @@ APP_LOAD_PARAMS += --path "1517992542'/1101353413'"
 APPVERSION_M=1
 APPVERSION_N=9
 APPVERSION_P=2
-APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)-remove_v_check
+APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
 APP_LOAD_FLAGS= --appFlags 0x240 --dep Ethereum:$(APPVERSION)

 ifeq ($(CHAIN),)
--- a/icons/nanos_app_bsc.gif
+++ b/icons/nanos_app_bsc.gif
--- a/icons/nanox_app_bsc.gif
+++ b/icons/nanox_app_bsc.gif
--- a/src/main.c
+++ b/src/main.c
@@ -351,8 +351,9 @@ tokenDefinition_t *getKnownToken(uint8_t *contractAddress) {
                break;
            case CHAIN_KIND_FLARE:
                currentToken = (tokenDefinition_t *) PIC(&TOKENS_FLARE[i]);
-                break case CHAIN_KIND_THETA : currentToken =
-                                                  (tokenDefinition_t *) PIC(&TOKENS_THETA[i]);
+                break;
+            case CHAIN_KIND_THETA:
+                currentToken = (tokenDefinition_t *) PIC(&TOKENS_THETA[i]);
                break;
            case CHAIN_KIND_BSC:
                currentToken = (tokenDefinition_t *) PIC(&TOKENS_BSC[i]);