Improve swap

app/Makefile.version

@@ -3,4 +3,4 @@ APPVERSION_M=2
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=36
 # This is the patch version of this release
-APPVERSION_P=0
+APPVERSION_P=1

app/src/apdu_handler.c

@@ -213,6 +213,11 @@ __Z_INLINE void handleSign(volatile uint32_t *flags, volatile uint32_t *tx, uint
         const int error_msg_length = strnlen(error_msg, sizeof(G_io_apdu_buffer));
         MEMCPY(G_io_apdu_buffer, error_msg, error_msg_length);
         *tx += (error_msg_length);
+
+#ifdef HAVE_SWAP
+        // Finalize the transaction with failure status
+        finalize_exchange_sign_transaction(false);
+#endif 
         THROW(APDU_CODE_DATA_INVALID);
     }
 

app/src/common/main.c

@@ -104,8 +104,6 @@ __attribute__((section(".boot"))) int main(int arg0) {
         }
 #endif
     } else {
-        // The app has been launched from the dashboard
-        // G_swap_state.called_from_swap = false;
         BEGIN_TRY
         {
             TRY

app/src/swap/handle_check_address.c

@@ -23,25 +23,25 @@
 
 
 void handle_check_address(check_address_parameters_t *params) {
-    if (params == NULL || params->address_to_check == 0) {
+    if (params == NULL || params->address_to_check == NULL) {
         return;
     }
 
     // Reset result
     params->result = 0;
 
     // Address parameters have the following structure
-    // 00 byte |path length (1 byte) | bip32 path (4 * pathLength bytes)
+    // path length (1 byte) | bip32 path (4 * pathLength bytes)
     // Get the path
     uint32_t bip32_path[HDPATH_LEN_DEFAULT] = {0};
-    uint8_t bip32_path_length = params->address_parameters[1];
+    uint8_t bip32_path_length = params->address_parameters[0];
 
     if (bip32_path_length != HDPATH_LEN_DEFAULT) {
         return;
     }
 
     for (uint32_t i = 0; i < HDPATH_LEN_DEFAULT; i++) {
-        readU32BE(params->address_parameters + 2 + (i * 4), &bip32_path[i]);
+        readU32BE(params->address_parameters + 1 + (i * 4), &bip32_path[i]);
     }
 
     char address_computed[100] = {0};