Feature/btc #6057

SeniorZhai · 2026-01-05T06:57:06Z

No description provided.

# Conflicts: # app/src/main/java/one/mixin/android/crypto/CryptoWalletHelper.kt

# Conflicts: # app/src/sharedTest/java/one.mixin.android.mock/AccountMock.kt

Copilot

Pull request overview

This PR adds Bitcoin (BTC) support to the wallet feature, enabling users to manage Bitcoin in their classic wallets.

Key Changes

Added Bitcoin SegWit address generation and transaction signing support
Introduced UTXO management with a new outputs database table
Created UI for prompting users to add Bitcoin addresses to existing classic wallets

Reviewed changes

Copilot reviewed 47 out of 47 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
app/src/main/res/values/strings.xml	Added English strings for Bitcoin wallet introduction feature
app/src/main/res/values-zh-rTW/strings.xml	Added Traditional Chinese translations for Bitcoin feature
app/src/main/res/values-zh-rCN/strings.xml	Added Simplified Chinese translations for Bitcoin feature
app/src/main/res/layout/fragment_classic_wallet_missing_btc_address_intro.xml	New layout for Bitcoin address introduction screen
app/src/main/res/layout/fragment_classic_wallet_missing_btc_address_bottom_sheet.xml	New bottom sheet layout for Bitcoin address setup
app/src/main/res/drawable/*.xml	Added vector drawables for Bitcoin wallet features (with naming issues)
app/src/main/java/one/mixin/android/ui/wallet/ClassicWalletMissingBtcAddressFragment.kt	New fragment handling Bitcoin address addition to classic wallets
app/src/main/java/one/mixin/android/ui/home/MainActivity.kt	Integrated Bitcoin address check before wallet navigation
app/src/main/java/one/mixin/android/web3/js/Web3Signer.kt	Added Bitcoin transaction signing logic
app/src/main/java/one/mixin/android/tip/TipSign.kt	Added Bitcoin key derivation using BIP84 (SegWit)
app/src/main/java/one/mixin/android/crypto/CryptoWalletHelper.kt	Added Bitcoin address generation methods for SegWit and Taproot
app/src/main/java/one/mixin/android/db/WalletDatabase.kt	Added database migration to version 7 with outputs table
app/src/main/java/one/mixin/android/db/web3/WalletOutputDao.kt	New DAO for managing Bitcoin UTXOs
app/src/main/java/one/mixin/android/api/response/web3/WalletOutput.kt	New data model for Bitcoin outputs (UTXOs)
app/src/main/java/one/mixin/android/job/RefreshWeb3BitCoinJob.kt	New job for refreshing Bitcoin UTXO data
app/build.gradle	Updated BouncyCastle dependency version management

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

app/src/main/java/one/mixin/android/tip/wc/internal/TipGas.kt

Copilot · 2026-01-05T07:07:40Z

app/src/main/res/drawable/ic_wallet_seamless.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"


The drawable filename contains a typo. "saemless" should be "seamless".

app/src/main/res/layout/fragment_wallet_missing_btc_address_intro.xml

app/src/main/res/drawable/ic_wallet_compatibility.xml

app/src/main/res/layout/fragment_wallet_missing_btc_address_intro.xml

app/src/main/java/one/mixin/android/db/web3/vo/Web3TokenItem.kt

Copilot · 2026-01-05T07:07:41Z

app/src/main/java/one/mixin/android/ui/wallet/InputFragment.kt

+                    web3Token != null && (chainToken == null || gas == null || (chainToken?.balance?.toBigDecimalOrNull() ?: BigDecimal.ZERO) < gas ||
+                            (web3Token?.assetId == chainToken?.assetId && (gas ?: BigDecimal.ZERO).add(BigDecimal(v)) > (web3Token?.balance?.toBigDecimalOrNull() ?: BigDecimal.ZERO)))


The conditional logic appears to have incorrect balance comparison. The chain token balance check should have proper parentheses grouping to ensure the comparison operators work correctly.

app/src/main/java/one/mixin/android/ui/wallet/InputFragment.kt

# Conflicts: # app/src/main/java/one/mixin/android/job/BaseJob.kt # app/src/main/java/one/mixin/android/job/RefreshWeb3Job.kt # app/src/main/java/one/mixin/android/ui/common/LoginVerifyBottomSheetDialogFragment.kt # app/src/main/java/one/mixin/android/ui/home/MainActivity.kt

…uilder

Copilot

Pull request overview

Copilot reviewed 87 out of 89 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

# Conflicts: # app/src/main/java/one/mixin/android/job/BaseJob.kt # app/src/main/java/one/mixin/android/job/RefreshWeb3Job.kt # app/src/main/java/one/mixin/android/ui/common/BottomSheetViewModel.kt # app/src/main/java/one/mixin/android/ui/common/LoginVerifyBottomSheetDialogFragment.kt # app/src/main/java/one/mixin/android/ui/tip/TipFragment.kt

Copilot

Pull request overview

Copilot reviewed 79 out of 81 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

SeniorZhai added 23 commits December 24, 2025 18:52

Generate Bitcoin address

d6ada0b

Unlock btc address

e9b6cd1

Merge remote-tracking branch 'origin/master' into feature/btc

f73cb6a

# Conflicts: # app/src/main/java/one/mixin/android/crypto/CryptoWalletHelper.kt

Update wallet

96df403

Merge remote-tracking branch 'origin/master' into feature/btc

897efc5

Merge remote-tracking branch 'origin/master' into feature/btc

cc14771

Merge remote-tracking branch 'origin/fix/test' into fix/room-sql-parser

9f6197e

# Conflicts: # app/src/sharedTest/java/one.mixin.android.mock/AccountMock.kt

Fetch utxo

4242fa4

Merge remote-tracking branch 'origin/master' into feature/btc

122e51d

Update btc fee

1644db3

Merge commit '037dd4065f64d33ac8907b2c6fa3ee141415a615' into feature/btc

8009ade

Update local output

8b5b9bf

Remove unused code

fa97196

Code clean

fd11231

Refresh utxo

1170698

Update btc transaction

7bdbe8a

Merge branch 'master' into feature/btc

3d2fa2b

Merge commit '2d6d3e50ddae670906304200c54afb8a7f4a77d5' into feature/btc

7e2f70d

Update btc sign

8a652e7

Merge remote-tracking branch 'origin/master' into feature/btc

2b59e4d

Update btc sign

2c38b07

Update sign

78a4d78

Refresh gas

ed65570

SeniorZhai requested a review from Copilot January 5, 2026 06:57

Copilot started reviewing on behalf of SeniorZhai January 5, 2026 06:57 View session

Copilot AI reviewed Jan 5, 2026

View reviewed changes

SeniorZhai added 4 commits January 5, 2026 15:22

Merge commit '20169aa21e0bf49d55ea87b7ed537b188f710377' into feature/btc

bec89e2

Update database schema

6ea449e

Update cancel and speed up

43e358a

Update create wallet

ca2a936

SeniorZhai added 6 commits January 15, 2026 13:18

Update create wallet logic

c2507d2

Update database schema

aae7b1c

Update networks order, check wallet

e8723b9

Update pending delete

d508a7f

SeniorZhai force-pushed the feature/btc branch from 677ab52 to d508a7f Compare January 15, 2026 08:56

SeniorZhai added 3 commits January 15, 2026 17:16

Fix asset order

c258cd7

web3(btc): use min_fee from estimate-fee response and enforce in tx b…

8d39e80

…uilder

Code clean

9a48d1c

SeniorZhai requested a review from Copilot January 16, 2026 05:19

Copilot started reviewing on behalf of SeniorZhai January 16, 2026 05:20 View session

Merge branch 'master' into feature/btc

74489f4

Copilot AI reviewed Jan 16, 2026

View reviewed changes

Update cancel build

d19187b

SeniorZhai force-pushed the feature/btc branch 2 times, most recently from 97898d6 to 6177de5 Compare January 19, 2026 07:53

Update cancel and speed up

fc9df62

SeniorZhai force-pushed the feature/btc branch from 6177de5 to fc9df62 Compare January 19, 2026 08:10

SeniorZhai added 3 commits January 20, 2026 11:37

Merge remote-tracking branch 'origin/master' into feature/btc

75ab894

Revert "Bump Android Gradle Plugin version"

3668063

SeniorZhai added the testing Now testing, but you can review label Jan 20, 2026

SeniorZhai marked this pull request as ready for review January 20, 2026 07:21

SeniorZhai requested a review from Copilot January 20, 2026 07:22

Copilot started reviewing on behalf of SeniorZhai January 20, 2026 07:22 View session

Copilot AI reviewed Jan 20, 2026

View reviewed changes

crossle and others added 3 commits January 20, 2026 14:37

Merge branch 'master' into feature/btc

d98425a

Update sql

2dac5fe

Update wallet list

b5163f6

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Feature/btc #6057

Feature/btc #6057

Uh oh!

SeniorZhai commented Jan 5, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		@@ -0,0 +1,15 @@
		<vector xmlns:android="http://schemas.android.com/apk/res/android"

		web3Token != null && (chainToken == null \|\| gas == null \|\| (chainToken?.balance?.toBigDecimalOrNull() ?: BigDecimal.ZERO) < gas \|\|
		(web3Token?.assetId == chainToken?.assetId && (gas ?: BigDecimal.ZERO).add(BigDecimal(v)) > (web3Token?.balance?.toBigDecimalOrNull() ?: BigDecimal.ZERO)))

Feature/btc #6057

Are you sure you want to change the base?

Feature/btc #6057

Uh oh!

Conversation

SeniorZhai commented Jan 5, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Key Changes

Reviewed changes

Uh oh!

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants