Skip to content

feat(web3): check Solana fee balance in GasCheck before opening Brows… #6099

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

Open
SeniorZhai wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat(web3): check Solana fee balance in GasCheck before opening Brows… #6099

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d84d1f
feat(web3): check Solana fee balance in GasCheck before opening Brows…
SeniorZhai Jan 28, 2026
2c442f9
Merge branch 'master' into fix/solana-insufficient-sol-gate
crossle Mar 17, 2026
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
46 changes: 45 additions & 1 deletion app/src/main/java/one/mixin/android/ui/home/web3/GasCheckBottomSheetDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import one.mixin.android.util.viewBinding
import one.mixin.android.web3.Rpc
import one.mixin.android.web3.js.JsSignMessage
import one.mixin.android.web3.js.Web3Signer
import org.sol4kt.VersionedTransactionCompat
import org.web3j.utils.Convert
import org.web3j.utils.Numeric
import timber.log.Timber
Expand Down Expand Up @@ -94,6 +95,49 @@ class GasCheckBottomSheetDialogFragment : BottomSheetDialogFragment() {
}
}

private suspend fun checkSolanaBalanceOrShowError() {
if (!signMessage.isSolMessage()) {
showBrowserWalletBottomSheet()
return
}
if (signMessage.type != JsSignMessage.TYPE_RAW_TRANSACTION) {
showBrowserWalletBottomSheet()
return
}
val rawTx: String = signMessage.data ?: run {
showError(getString(R.string.Data_error))
return
}
val tx = runCatching { VersionedTransactionCompat.from(rawTx) }.getOrNull() ?: run {
showError(getString(R.string.Data_error))
return
}
val requiredFee: BigDecimal = tx.calcFee(Web3Signer.address)
val solAsset = viewModel.web3TokenItemById(Web3Signer.currentWalletId, Chain.Solana.assetId)
val solBalance: BigDecimal = solAsset?.balance?.toBigDecimalOrNull() ?: BigDecimal.ZERO
if (solBalance >= requiredFee) {
showBrowserWalletBottomSheet()
return
}
val solTokenItem: Web3TokenItem? = chainToken ?: viewModel.web3TokenItemById(Web3Signer.currentWalletId, Chain.Solana.assetId)
if (solTokenItem == null) {
showError(getString(R.string.Data_error))
return
}
TransferWeb3BalanceErrorBottomSheetDialogFragment
.newInstance(
Web3TokenFeeItem(
solTokenItem,
BigDecimal.ZERO,
requiredFee
)
).showNow(
parentFragmentManager,
TransferWeb3BalanceErrorBottomSheetDialogFragment.TAG
)
dismiss()
}

private val binding by viewBinding(FragmentBottomSheetBinding::inflate)

private lateinit var contentView: View
Expand Down Expand Up @@ -239,7 +283,7 @@ class GasCheckBottomSheetDialogFragment : BottomSheetDialogFragment() {
chainToken: Web3TokenItem?,
) {
if (chain == Chain.Solana) {
showBrowserWalletBottomSheet()
checkSolanaBalanceOrShowError()
return
}
val chainId = chain.getWeb3ChainId()
Expand Down
Loading