data/src/main/kotlin/com/vultisig/wallet/data/chains/helpers/ParsedSolanaTransaction.kt (1)

87-148: Consider using when expression for program ID matching.

The chained if statements could be consolidated into a when expression for improved readability, though the current implementation is functionally correct.

♻️ Suggested refactor

     private fun getInstructionType(programId: String, instructionData: ByteArray): String? {
         if (instructionData.isEmpty()) return null
 
         val discriminator = instructionData[0].toInt() and 0xFF
 
-        // System Program
-        if (programId == "11111111111111111111111111111111") {
-            return when (discriminator) {
+        return when (programId) {
+            "11111111111111111111111111111111" -> when (discriminator) {
                 0 -> "Create Account"
                 2 -> "Transfer"
                 3 -> "Assign"
                 4 -> "Create Account With Seed"
                 9 -> "Transfer With Seed"
                 else -> "System ($discriminator)"
             }
-        }
-
-        // Token Program
-        if (programId == "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA") {
-            return when (discriminator) {
+            "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" -> when (discriminator) {
                 0 -> "Initialize Mint"
                 1 -> "Initialize Account"
                 3 -> "Transfer"
                 7 -> "Mint To"
                 8 -> "Burn"
                 9 -> "Close Account"
                 12 -> "Transfer Checked"
                 else -> "Token ($discriminator)"
             }
-        }
-
-        // Token-2022 Program
-        if (programId == "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb") {
-            return when (discriminator) {
+            "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb" -> when (discriminator) {
                 0 -> "Initialize Mint"
                 1 -> "Initialize Account"
                 3 -> "Transfer"
                 7 -> "Mint To"
                 8 -> "Burn"
                 9 -> "Close Account"
                 12 -> "Transfer Checked"
                 else -> "Token-2022 ($discriminator)"
             }
-        }
-
-        // Associated Token Program
-        if (programId == "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL") {
-            return "Create Associated Token Account"
-        }
-
-        // Compute Budget Program
-        if (programId == "ComputeBudget111111111111111111111111111111") {
-            return when (discriminator) {
+            "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL" -> 
+                "Create Associated Token Account"
+            "ComputeBudget111111111111111111111111111111" -> when (discriminator) {
                 0 -> "Request Heap Frame"
                 1 -> "Set Compute Unit Limit"
                 2 -> "Set Compute Unit Price"
                 else -> "Compute Budget ($discriminator)"
             }
+            else -> null
         }
-
-        return null
     }

app/src/androidTest/java/com/vultisig/wallet/data/blockchain/ChainHelperModels.kt (1)

217-218: Consider renaming hasProgramId to match the JSON key semantics.

The property is named hasProgramId (suggesting a boolean "has X" pattern) but the JSON key is now program_id. This creates a semantic mismatch. Consider renaming the property to programId for clarity, or clarify via documentation why this Boolean field uses the program_id key.

app/src/androidTest/java/com/vultisig/wallet/data/blockchain/ChainHelperModelExtension.kt (2)

14-14: Remove unused imports.

The following imports appear to be unused in the active code:

• androidx.compose.runtime.remember (line 14)
• com.vultisig.wallet.data.chains.helpers.SolanaTransactionParser (line 18)
• kotlin.text.flatMap (line 33)

These were likely added for the commented-out code block and should be cleaned up.

♻️ Proposed fix

-import androidx.compose.runtime.remember
 import com.vultisig.wallet.data.models.proto.v1.SignDirectProto
 import com.vultisig.wallet.data.api.models.quotes.EVMSwapQuoteJson
 import com.vultisig.wallet.data.api.models.quotes.OneInchSwapTxJson
-import com.vultisig.wallet.data.chains.helpers.SolanaTransactionParser
 import com.vultisig.wallet.data.models.Chain
...
-import kotlin.text.flatMap

Also applies to: 18-18, 33-33

---

128-145: Remove commented-out code block.

This commented-out function has multiple issues:

1. It uses remember from Compose runtime, which only works inside @Composable functions—this is a data mapping extension file
2. Dead/commented code adds noise and confusion

If this logic is needed in the future, it should be properly designed and implemented in an appropriate location.

🗑️ Proposed fix: remove the commented block

-//internal fun SignSolana.toSignSolana(): vultisig.keysign.v1.SignSolana {
-//    val allInstructions = remember(this) {
-//        this.rawTransactions.map { tx ->
-//            try {
-//                val parsed = SolanaTransactionParser.parse(tx)
-//                parsed.instructions
-//            } catch (e: Exception) {
-//                emptyList()
-//            }
-//        }
-//    }
-//
-//
-//
-//    return SignSolana(
-//        rawTransactions = this.rawTransactions
-//    )
-//}
-

app/src/androidTest/java/com/vultisig/wallet/data/blockchain/ChainHelperModelExtension.kt (1)

129-146: Consider removing the commented-out SignSolana helper block.
It’s currently dead code and makes this mapper harder to scan. If you drop it, you can also remove the related imports.

♻️ Suggested cleanup

-//internal fun SignSolana.toSignSolana(): vultisig.keysign.v1.SignSolana {
-//    val allInstructions = remember(this) {
-//        this.rawTransactions.map { tx ->
-//            try {
-//                val parsed = SolanaTransactionParser.parse(tx)
-//                parsed.instructions
-//            } catch (e: Exception) {
-//                emptyList()
-//            }
-//        }
-//    }
-//
-//
-//
-//    return SignSolana(
-//        rawTransactions = this.rawTransactions
-//    )
-//}

data/src/main/kotlin/com/vultisig/wallet/data/chains/helpers/SolanaHelper.kt (1)

282-398: Consider extracting shared decode/parse logic.

Both getPreSignedImageHashForRaw and signRawTransaction duplicate the base64 decode → TransactionDecoder.decode → error check → hasTransaction check → SigningInput build sequence. Extracting a helper would reduce duplication and centralize error handling.

app/src/main/java/com/vultisig/wallet/ui/components/SignSolanaDisplayView.kt (2)

35-35: Redundant import.

flatMap is part of Kotlin's standard library and doesn't need an explicit import.

-import kotlin.collections.flatMap

---

65-76: Small touch target for the expand/collapse button.

The IconButton is only 10.dp, which is well below Material Design's recommended 48.dp minimum touch target. Users may find it difficult to tap. Consider increasing the button's clickable area while keeping the icon visually small.

Suggested approach

             IconButton(
                 onClick = { isExpanded = !isExpanded },
-                modifier = Modifier.size(10.dp)
+                modifier = Modifier.size(48.dp)
             ) {
                 UiIcon(
                     drawableResId = R.drawable.chevron,