Merge pull request #100 from LedgerHQ/develop

merge develop into master (B2CA-1859)

Author: tdejoigny-ledger

.clang-format

@@ -12,9 +12,9 @@ SortIncludes: false
 SpaceAfterCStyleCast: true
 AllowShortCaseLabelsOnASingleLine: false
 AllowAllArgumentsOnNextLine: false
-AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: Never
 AllowShortFunctionsOnASingleLine: None
 BinPackArguments: false
 BinPackParameters: false
 ---
+

Makefile

@@ -37,7 +37,7 @@ APPNAME = "Solana"
 # Application version
 APPVERSION_M = 1
 APPVERSION_N = 5
-APPVERSION_P = 3
+APPVERSION_P = 4
 APPVERSION = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)"
 
 # Application source files

src/handle_sign_message.c

@@ -95,14 +95,18 @@ static bool check_swap_validity(const SummaryItemKind_t kinds[MAX_TRANSACTION_SU
                                 size_t num_summary_steps) {
     bool amount_ok = false;
     bool recipient_ok = false;
-    if (num_summary_steps != 2) {
-        PRINTF("2 steps expected for transaction in swap context, not %u\n", num_summary_steps);
+    if (num_summary_steps != 2 && num_summary_steps != 3) {
+        PRINTF("2 or 3 steps expected for transaction in swap context, not %u\n",
+               num_summary_steps);
         return false;
     }
     for (size_t i = 0; i < num_summary_steps; ++i) {
         transaction_summary_display_item(i, DisplayFlagNone | DisplayFlagLongPubkeys);
         switch (kinds[i]) {
             case SummaryItemAmount:
+                if (strcmp(G_transaction_summary_title, "Max fees") == 0) {
+                    break;  // Should we check the fees ?
+                }
                 amount_ok =
                     check_swap_amount(G_transaction_summary_title, G_transaction_summary_text);
                 break;