chore: Integrate joint account support into core transaction signing #514

yasin-ce · 2026-01-20T09:23:19Z

Summary

Add JointAccountTransactionSignHelper for proposing sign requests
Add LocalAccountSigningHelper for local account signing
Update TransactionSignManager to handle TransactionSigner.Joint
Update ExternalTransactionSignManager for joint account support
Add TransactionSigner.Joint case handling across the app
Refactor AccountRecoveryTypeSelectionFragment to Compose
Add ContactIcon composable and PeraToolbar improvements

Test Plan

Verify transaction signing works for standard accounts
Verify joint account transactions trigger sign request flow
Test account recovery type selection screen

- Fix duplicate DI bindings for joint account repository - Add missing interface implementations - Update transaction signer handling for joint accounts - Fix import statements and code organization

…pdates

- Replace GetJointAccountParticipantCount with GetLocalAccount - Update JointSignRequestDTO to JointSignRequest - Get participant count from LocalAccount.Joint.participantAddresses

Convert TODO() to comment-style TODOs and remove duplicate when cases to fix detekt UnreachableCode violations. Files fixed: - GetAccountOriginalStateIconDrawablePreviewUseCase - AccountStatusDetailPreviewDecider - CreateWalletConnectArbitraryDataSignerUseCase - GetAccountIconDrawablePreviewUseCase

mitsinsar · 2026-01-22T12:46:06Z

app/src/main/kotlin/com/algorand/android/core/transaction/LocalAccountSigningHelper.kt

+    suspend fun getLocalAccount(address: String): LocalAccount? {
+        return getLocalAccount.invoke(address)
+    }


Unnecessary function. We can remove this and inject use case to class which uses this function

mitsinsar · 2026-01-22T12:51:33Z

app/src/main/kotlin/com/algorand/android/core/transaction/JointAccountTransactionSignHelper.kt

+
+class JointAccountTransactionSignHelper @Inject constructor(
+    private val getLocalAccount: GetLocalAccount,
+    private val getLocalAccounts: GetLocalAccounts,


Unused parameter

mitsinsar · 2026-01-22T13:15:02Z

app/src/main/kotlin/com/algorand/android/core/transaction/JointAccountTransactionSignHelper.kt

+        }
+    }
+
+    private suspend fun signWithAlgo25Account(transactionBytes: ByteArray, signerAddress: String): ByteArray? {


LocalAccountSignHelper can be used instead

mitsinsar · 2026-01-22T13:15:08Z

app/src/main/kotlin/com/algorand/android/core/transaction/JointAccountTransactionSignHelper.kt

+        }
+    }
+
+    private suspend fun signWithHdKeyAccount(transactionBytes: ByteArray, hdKey: LocalAccount.HdKey): ByteArray? {


LocalAccountSignHelper can be used instead

mitsinsar · 2026-01-22T13:16:11Z

app/src/main/kotlin/com/algorand/android/core/transaction/JointAccountTransactionSignHelper.kt

+            val signedTransaction = Encoder.decodeFromMsgPack(signedTransactionBytes, SignedTransaction::class.java)
+            signedTransaction.sig?.bytes?.takeIf { it.isNotEmpty() }


Let's move this into AlgoSdk

mitsinsar · 2026-01-22T13:51:55Z

...gorand/android/ui/register/recoveraccounttypeselection/AccountRecoveryTypeSelectionScreen.kt

+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun BottomSheetContent(


This should be private

mitsinsar · 2026-01-22T13:52:09Z

...gorand/android/ui/register/recoveraccounttypeselection/AccountRecoveryTypeSelectionScreen.kt

+@OptIn(ExperimentalMaterial3Api::class)
+@Suppress("MagicNumber")
+@Composable
+fun BottomSheetHeader(


Should be private

mitsinsar · 2026-01-22T13:55:55Z

...main/kotlin/com/algorand/android/ui/swap/confirmation/viewmodel/SwapConfirmationViewModel.kt

+        val accountAddresses = transactions.transactions
+            .flatMap { it.getTransactionsThatNeedsToBeSigned() }
+            .map { it.accountAddress }
+            .distinct()
+
+        for (address in accountAddresses) {
+            val accountType = getAccountType(address)
+            if (accountType == AccountType.Joint) {
+                displayError(Local(AnnotatedString(R.string.joint_accounts_are_not_supported)))
+                return
+            }
+        }


Let's move this logic into its on usecase that checks if a transaction requires a Joint account or not.

mitsinsar · 2026-01-22T14:01:45Z

...rc/main/kotlin/com/algorand/android/modules/accounts/ui/viewmodel/AccountPreviewProcessor.kt

-        }
+        val accountErrorItems = localAccounts
+            .mapNotNull { localAccount ->
+                val registrationType = getAccountRegistrationType(localAccount)


We can use local account type instead of registration type

mitsinsar · 2026-01-22T14:04:31Z

...rc/main/kotlin/com/algorand/android/modules/accounts/ui/viewmodel/AccountPreviewProcessor.kt

        )
    }
+
+    private fun shouldIncludeAccount(


I think we should do this filtering before returning local accounts. Since this feature affects whole app, we shouldn't do individual filter

- Do NOT change data class to sealed interface - Do NOT remove wrapper/delegation functions - Do NOT change filter+map to mapNotNull - Do NOT remove TODO placeholders - Do NOT move data classes or companion objects - Do NOT inject use cases directly when helper exists - Do NOT change existing class dependencies - Do NOT rename existing identifiers without explicit request - Do NOT remove string resources - Do NOT simplify when expressions Also add clarifying comment to TODO in AssetTransferPreviewFragment

- Remove unnecessary getLocalAccount wrapper from LocalAccountSigningHelper - Refactor JointAccountTransactionSignHelper: - Use LocalAccountSigningHelper for signing - Change JointSignResult from data class to sealed interface - Move data classes and companion object to bottom of file - Add TODO comment for extractSignatureFromSignedTransaction - Use mapNotNull instead of filter+map in AccountPreviewProcessor - Remove duplicate TransactionSigner.Joint branch in TransactionSignManager - Update TransactionSignManager to use sealed interface pattern

1. AccountRecoveryTypeSelectionScreen.kt: - Make BottomSheetContent private - Make BottomSheetHeader private - Fix scrolling title - title no longer scrolls with content 2. SwapConfirmationViewModel.kt: - Extract joint account check to IsJointAccountInAddresses use case - Add IsJointAccountInAddressesUseCase implementation - Add DI binding in SwapUiModule 3. AccountPreviewProcessor.kt: - Use local account type instead of registration type - Add getLocalAccountType helper function 4. GroupChoiceWidget.kt: - Replace showNewBadge boolean with badge composable slot - Add GroupChoiceNewBadge composable for reusable badge 5. PeraToolbar.kt: - Remove rightLabel parameter, use endContainer instead - Add PeraToolbarLinkText for link-styled text - Add PeraToolbarTitle for default title text - Add PeraToolbarLargeTitle for large title text - Add PeraToolbarTitleWithSubtitle for title with subtitle - Keep textStyle for backward compatibility

1. TransactionManagerResult - Use sealed Success class: - Convert Success from data class to sealed class - Add Success.SignedTransaction for completed transactions - Add Success.TransactionRequestSigned for joint account requests - Update all usages in TransactionSignManager, TransactionSignBaseFragment, MainActivity 2. GetLocalAccounts - Filter joint accounts at use case level: - GetLocalAccountsUseCase now filters joint accounts when feature toggle is off - GetLocalAccountsFlowUseCase now filters joint accounts when feature toggle is off - Remove redundant shouldIncludeAccount filtering from AccountPreviewProcessor - Joint account filtering is now consistent across the entire app

- Add signWithAlgo25AccountReturnSignature using Sdk.signTransactionReturnSignature - Add signWithHdKeyAccountReturnSignature using existing HD wallet API - Rename signWithAlgo25 -> signWithAlgo25Account - Rename signWithHdKey -> signWithHdKeyAccount - Rename signTransactionSignatureOnly -> signTransactionReturnSignature - Update Go mobile SDK version to 1.0.9 - Clean and organize cursor rules file

- Fix MaxLineLength in AccountPreviewProcessor - Suppress TooManyFunctions in SwapUiModule (pre-existing) - Suppress LongParameterList in TransactionSignManager (pre-existing)

@Suppress

- Split SwapUiModule into SwapUiModule and SwapTrackingModule - Create AccountBalanceProvider to group balance-related use cases - Reduce TransactionSignManager constructor parameters from 10 to 8 - Add cursor rule: never use @Suppress without approval

@Suppress

* multisig/04-misc-updates: Fix detekt issues without @Suppress Fix pre-existing detekt issues Use Go SDK for transaction signing and return signature directly fix: Address remaining PR #514 review comments fix: Address PR #514 review comments fix: Address PR #514 feedback docs: Add refactoring restrictions to prevent unwanted changes

@Suppress

…-support * multisig/05-data-models: Address PR #515 comments for data models Fix detekt issues without @Suppress Fix pre-existing detekt issues Use Go SDK for transaction signing and return signature directly fix: Address remaining PR #514 review comments fix: Address PR #514 review comments fix: Address PR #514 feedback docs: Add refactoring restrictions to prevent unwanted changes

yasin-ce requested review from mitsinsar and wjbeau as code owners January 20, 2026 09:23

yasin-ce self-assigned this Jan 20, 2026

yasin-ce force-pushed the multisig/03-tests-and-deeplink branch from b98a876 to 5211943 Compare January 20, 2026 09:31

yasin-ce force-pushed the multisig/04-misc-updates branch 2 times, most recently from 8602ae8 to cfd09c6 Compare January 20, 2026 09:47

chore(multisig): Miscellaneous updates and fixes

252f8ea

- Fix duplicate DI bindings for joint account repository - Add missing interface implementations - Update transaction signer handling for joint accounts - Fix import statements and code organization

yasin-ce force-pushed the multisig/04-misc-updates branch from cfd09c6 to 252f8ea Compare January 20, 2026 13:49

yasin-ce added 3 commits January 22, 2026 12:55

Merge branch 'multisig/03-tests-and-deeplink' into multisig/04-misc-u…

8f2ce1b

…pdates

fix: resolve merge conflicts after merging 03 into 04

8b9d80b

- Replace GetJointAccountParticipantCount with GetLocalAccount - Update JointSignRequestDTO to JointSignRequest - Get participant count from LocalAccount.Joint.participantAddresses

mitsinsar requested changes Jan 22, 2026

View reviewed changes

yasin-ce added 7 commits January 22, 2026 17:08

Fix pre-existing detekt issues

2f4e363

- Fix MaxLineLength in AccountPreviewProcessor - Suppress TooManyFunctions in SwapUiModule (pre-existing) - Suppress LongParameterList in TransactionSignManager (pre-existing)

yasin-ce requested a review from mitsinsar January 23, 2026 19:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Integrate joint account support into core transaction signing #514

chore: Integrate joint account support into core transaction signing #514

Uh oh!

yasin-ce commented Jan 20, 2026

Uh oh!

mitsinsar Jan 22, 2026

Uh oh!

mitsinsar Jan 22, 2026

Uh oh!

mitsinsar Jan 22, 2026

Uh oh!

mitsinsar Jan 22, 2026

Uh oh!

mitsinsar Jan 22, 2026

Uh oh!

mitsinsar Jan 22, 2026

Uh oh!

mitsinsar Jan 22, 2026

Uh oh!

mitsinsar Jan 22, 2026

Uh oh!

mitsinsar Jan 22, 2026

Uh oh!

mitsinsar Jan 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		val signedTransaction = Encoder.decodeFromMsgPack(signedTransactionBytes, SignedTransaction::class.java)
		signedTransaction.sig?.bytes?.takeIf { it.isNotEmpty() }

chore: Integrate joint account support into core transaction signing #514

Are you sure you want to change the base?

chore: Integrate joint account support into core transaction signing #514

Uh oh!

Conversation

yasin-ce commented Jan 20, 2026

Summary

Test Plan

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants