fix: Resolve review comments

Author: muzaffarbhat07

apps/solana_app/solana_sign_txn.c

@@ -541,7 +541,7 @@ static bool verify_solana_transfer_token_transaction() {
 
   const uint8_t* token_mint = solana_txn_context->transaction_info
                                 .instruction[transfer_instruction_index]
-                                .program.transferChecked.token_mint;
+                                .program.transfer_checked.token_mint;
   const solana_token_program_t *contract = NULL;
   if (!is_token_whitelisted(token_mint, &contract)) {
     // Contract Unverifed, Display warning
@@ -566,7 +566,7 @@ static bool verify_solana_transfer_token_transaction() {
 
     const uint8_t token_decimals = solana_txn_context->transaction_info
                                     .instruction[transfer_instruction_index]
-                                    .program.transferChecked.decimals;
+                                    .program.transfer_checked.decimals;
 
     char display[50] = {'\0'};
     snprintf(display,
@@ -586,7 +586,7 @@ static bool verify_solana_transfer_token_transaction() {
     contract = &empty_contract;
   } else {
     char msg[100] = "";
-    snprintf(msg, sizeof(msg), "Send \n%s on \n%s", contract->symbol, SOLANA_NAME);
+    snprintf(msg, sizeof(msg), UI_TEXT_SEND_TOKEN_PROMPT, contract->symbol, SOLANA_NAME);
     if (!core_confirmation(msg, solana_send_error)) {
       return false;
     }
@@ -616,7 +616,7 @@ static bool verify_solana_transfer_token_transaction() {
   if (memcmp(associated_token_address,
              solana_txn_context->transaction_info
                  .instruction[transfer_instruction_index]
-                 .program.transferChecked.destination,
+                 .program.transfer_checked.destination,
              SOLANA_ACCOUNT_ADDRESS_LENGTH) != 0) {
     solana_send_error(ERROR_COMMON_ERROR_CORRUPT_DATA_TAG, 2);
     return false;
@@ -636,7 +636,7 @@ static bool verify_solana_transfer_token_transaction() {
   while (i--)
     be_units[i] = solana_txn_context->transaction_info
                       .instruction[transfer_instruction_index]
-                      .program.transferChecked.amount >>
+                      .program.transfer_checked.amount >>
                   8 * (7 - i);
 
   byte_array_to_hex_string(be_units, 8, amount_string, sizeof(amount_string));

apps/solana_app/solana_txn_helpers.c

@@ -241,38 +241,38 @@ int solana_byte_array_to_unsigned_txn(uint8_t *byte_array,
     switch (instruction_enum) {
       case STPI_TRANSFER_CHECKED: // transfer checked instruction
         utxn->instruction[transfer_instruction_index]
-          .program.transferChecked.source =
+          .program.transfer_checked.source =
           utxn->account_addresses +
           (*(utxn->instruction[transfer_instruction_index]
                   .account_addresses_index +
               0) *
             SOLANA_ACCOUNT_ADDRESS_LENGTH);
         utxn->instruction[transfer_instruction_index]
-          .program.transferChecked.token_mint =
+          .program.transfer_checked.token_mint =
           utxn->account_addresses +
           (*(utxn->instruction[transfer_instruction_index]
                   .account_addresses_index +
               1) *
             SOLANA_ACCOUNT_ADDRESS_LENGTH);
         utxn->instruction[transfer_instruction_index]
-            .program.transferChecked.destination =
+            .program.transfer_checked.destination =
             utxn->account_addresses +
             (*(utxn->instruction[transfer_instruction_index]
                   .account_addresses_index +
               2) *
             SOLANA_ACCOUNT_ADDRESS_LENGTH);
         utxn->instruction[transfer_instruction_index]
-          .program.transferChecked.owner =
+          .program.transfer_checked.owner =
           utxn->account_addresses +
           (*(utxn->instruction[transfer_instruction_index]
                   .account_addresses_index +
               3) *
             SOLANA_ACCOUNT_ADDRESS_LENGTH);
-        utxn->instruction[transfer_instruction_index].program.transferChecked.amount =
+        utxn->instruction[transfer_instruction_index].program.transfer_checked.amount =
             U64_READ_LE_ARRAY(
                 utxn->instruction[transfer_instruction_index].opaque_data + 1);
-        utxn->instruction[transfer_instruction_index].program.transferChecked.decimals =
-            *(utxn->instruction[transfer_instruction_index].opaque_data + 9);
+        utxn->instruction[transfer_instruction_index].program.transfer_checked.decimals =
+            *(utxn->instruction[transfer_instruction_index].opaque_data + sizeof(uint64_t) + 1);  // decimal value comes after amount(which is a u64)
       break;
 
       default:

apps/solana_app/solana_txn_helpers.h

@@ -130,7 +130,7 @@ typedef struct solana_instruction {
   uint8_t *opaque_data;
   union {
     solana_transfer_data transfer;
-    solana_token_transfer_checked_data transferChecked;
+    solana_token_transfer_checked_data transfer_checked;
   } program;
 } solana_instruction;
 

src/constant_texts.h

@@ -31,7 +31,7 @@
 #define UI_TEXT_SEND_PROMPT "Send %s on %s"
 #define UI_TEXT_SIGN_TXN_PROMPT "Sign transaction on %s from %s"
 #define UI_TEXT_REVIEW_TXN_PROMPT "Review transaction to %s"
-#define UI_TEXT_SEND_TOKEN_PROMPT "Send %s on %s from %s"
+#define UI_TEXT_SEND_TOKEN_PROMPT "Send \n%s on \n%s"
 #define UI_TEXT_BTC_RECEIVER "Receiver #%d"
 #define UI_TEXT_BTC_FEE "Transaction fee"
 #define UI_TEXT_SIGN_PROMPT "Sign %s message on %s from %s"