Skip to content

Fix address book transfer dialog dismissal #6296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crossle merged 1 commit into from
Apr 14, 2026
+27 −20
Merged

Fix address book transfer dialog dismissal #6296

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 27 additions & 20 deletions app/src/main/java/one/mixin/android/ui/address/TransferDestinationInputFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,33 +492,40 @@ class TransferDestinationInputFragment() : BaseFragment(R.layout.fragment_addres
val chainId = token?.chainId ?: web3Token?.chainId ?: return@TransferDestinationInputPage
AddressSearchBottomSheetDialogFragment.newInstance(chainId).apply {
onAddressClick = { address ->
requireView().hideKeyboard()
this@TransferDestinationInputFragment.requireView().hideKeyboard()
if (web3Token != null) {
val selectedWeb3Token = web3Token!!
val dialog =
indeterminateProgressDialog(message = R.string.Please_wait_a_bit).apply {
setCancelable(false)
}
lifecycleScope.launch {
this@TransferDestinationInputFragment.lifecycleScope.launch {
dialog.show()
val fromAddress = web3ViewModel.getAddressesByChainId(web3Token!!.walletId, web3Token!!.chainId)?.destination
if (fromAddress.isNullOrBlank()) {
toast(R.string.Alert_Not_Support)
} else {
(chainToken ?: web3ViewModel.web3TokenItemById(
web3Token!!.walletId,
web3Token!!.chainId
))?.let { chain ->
navigateToInputFragmentWithBundle(Bundle().apply {
putString(InputFragment.ARGS_FROM_ADDRESS, fromAddress)
putString(InputFragment.ARGS_TO_ADDRESS, address.destination)
putString(InputFragment.ARGS_TO_ADDRESS_TAG, address.tag)
putParcelable(InputFragment.ARGS_WEB3_TOKEN, web3Token!!)
putParcelable(InputFragment.ARGS_WEB3_CHAIN_TOKEN, chain)
putParcelable(ARGS_WALLET, wallet)
})
try {
val fromAddress = web3ViewModel.getAddressesByChainId(
selectedWeb3Token.walletId,
selectedWeb3Token.chainId
)?.destination
if (fromAddress.isNullOrBlank()) {
toast(R.string.Alert_Not_Support)
} else {
(chainToken ?: web3ViewModel.web3TokenItemById(
selectedWeb3Token.walletId,
selectedWeb3Token.chainId
))?.let { chain ->
navigateToInputFragmentWithBundle(Bundle().apply {
putString(InputFragment.ARGS_FROM_ADDRESS, fromAddress)
putString(InputFragment.ARGS_TO_ADDRESS, address.destination)
putString(InputFragment.ARGS_TO_ADDRESS_TAG, address.tag)
putParcelable(InputFragment.ARGS_WEB3_TOKEN, selectedWeb3Token)
putParcelable(InputFragment.ARGS_WEB3_CHAIN_TOKEN, chain)
putParcelable(ARGS_WALLET, wallet)
})
}
}
} finally {
dialog.dismiss()
}
dialog.dismiss()
}
} else if (token != null) {
navigateToInputFragmentWithBundle(Bundle().apply {
Expand Down Expand Up @@ -665,7 +672,7 @@ class TransferDestinationInputFragment() : BaseFragment(R.layout.fragment_addres
onComplete = { label ->
errorInfo = null
if (token == null && web3Token != null) {
lifecycleScope.launch {
this@TransferDestinationInputFragment.lifecycleScope.launch {
val t = web3ViewModel.syncAsset(web3Token!!.assetId) ?: return@launch
handleLabelComplete(t, address, memo, label, navController)
}
Expand Down
Loading