SpendingAmountScreen state handling improvement

[jvsena42]

Related to #229

Description

• Error message improvements
• Max amount specific error message
• Improvement on max amount and quarter button logic
• Improvement on loading logic
• Layout logic cleanup

Preview

transfer_tested.mp4

QA Notes

Tested

• Normal Success flow
• Max amount
• 25%
• Advanced
• Error value higher than max amount
• Error liquidity

[jvsena42]

I'll do the TransferViewModel clean up and Unit tests in other branch to don't obfuscate the fixes from this one

[ovitrif]

Very nice work!

Found only an issue which needs to be addressed IMHO, related to the max amount fee calculation

[ovitrif]

We always get NodeException.InsufficientFunds exception when trying to calculateTotalFee for the entire onChainBalance.

That's the reason I added walletRepo.getMaxSendAmount(), which is not perfect either (I got sometimes failure for the onChainBalance - 1000sat buffer solution), but still much less error-prone:

bitkit-android/app/src/main/java/to/bitkit/repositories/WalletRepo.kt

Lines 318 to 336 in 46d613a

	suspendfungetMaxSendAmount(): ULong= withContext(bgDispatcher) {
	val totalOnchainSats = balanceState.value.totalOnchainSats
	if (totalOnchainSats ==0uL) {
	return@withContext 0uL
	}
	try {
	val minFeeBuffer =1000uL
	val amountSats = (totalOnchainSats - minFeeBuffer).coerceAtLeast(0uL)
	val fee = lightningRepo.calculateTotalFee(amountSats).getOrThrow()
	val maxSendable = (totalOnchainSats - fee).coerceAtLeast(0uL)
	return@withContext maxSendable
	} catch (_:Throwable) {
	Logger.debug("Could not calculate max send amount, using as fallback 90% of total", context =TAG)
	val fallbackMax = (totalOnchainSats.toDouble() *0.9).toULong()
	return@withContext fallbackMax
	}
	}

Much recommended to use the getMaxSendAmount() here as well, that way we won't ALWAYS end up with the DEFAULT_TX_FEE.

PS. I informed @coreyphillips about this issue but it's not the highest priority thus looking into it will be delayed.

[jvsena42]

Much better, though I still get error: Invalid request format when selecting the max amount

[ovitrif]

True, because Invalid request format comes from bitkit-core's http call to Blocktank staging.

[jvsena42]

This PR fixes the bug introduced here

[ovitrif]

Nice refactor, the changed code works good!

Added an remark for improvement, feel free to address outside of this PR though.

Tested

• Normal Success flow
• Max amount
• 25%
• Error value higher than max amount

[ovitrif]

in the RN app, the amount will not update if it would exceed the max limit.

I think we can easily do the same here with this code right after the effect:

_spendingUiState.update { it.copy(overrideSats = it.satsAmount) }
return

[jvsena42]

Related to #229

Description

• Error message improvements
• Max amount specific error message
• Improvement on max amount and quarter button logic
• Improvement on loading logic
• Layout logic cleanup

Preview

transfer_tested.mp4

QA Notes

Tested

• Normal Success flow
• Max amount
• 25%
• Advanced
• Error value higher than max amount
• Error liquidity

[jvsena42]

I'll do the TransferViewModel clean up and Unit tests in other branch to don't obfuscate the fixes from this one

[ovitrif]

Very nice work!

Found only an issue which needs to be addressed IMHO, related to the max amount fee calculation

[ovitrif]

We always get NodeException.InsufficientFunds exception when trying to calculateTotalFee for the entire onChainBalance.

That's the reason I added walletRepo.getMaxSendAmount(), which is not perfect either (I got sometimes failure for the onChainBalance - 1000sat buffer solution), but still much less error-prone:

bitkit-android/app/src/main/java/to/bitkit/repositories/WalletRepo.kt

Lines 318 to 336 in 46d613a

	suspendfungetMaxSendAmount(): ULong= withContext(bgDispatcher) {
	val totalOnchainSats = balanceState.value.totalOnchainSats
	if (totalOnchainSats ==0uL) {
	return@withContext 0uL
	}
	try {
	val minFeeBuffer =1000uL
	val amountSats = (totalOnchainSats - minFeeBuffer).coerceAtLeast(0uL)
	val fee = lightningRepo.calculateTotalFee(amountSats).getOrThrow()
	val maxSendable = (totalOnchainSats - fee).coerceAtLeast(0uL)
	return@withContext maxSendable
	} catch (_:Throwable) {
	Logger.debug("Could not calculate max send amount, using as fallback 90% of total", context =TAG)
	val fallbackMax = (totalOnchainSats.toDouble() *0.9).toULong()
	return@withContext fallbackMax
	}
	}

Much recommended to use the getMaxSendAmount() here as well, that way we won't ALWAYS end up with the DEFAULT_TX_FEE.

PS. I informed @coreyphillips about this issue but it's not the highest priority thus looking into it will be delayed.

[jvsena42]

Much better, though I still get error: Invalid request format when selecting the max amount

[ovitrif]

True, because Invalid request format comes from bitkit-core's http call to Blocktank staging.

[jvsena42]

This PR fixes the bug introduced here

[ovitrif]

Nice refactor, the changed code works good!

Added an remark for improvement, feel free to address outside of this PR though.

Tested

• Normal Success flow
• Max amount
• 25%
• Error value higher than max amount

[ovitrif]

in the RN app, the amount will not update if it would exceed the max limit.

I think we can easily do the same here with this code right after the effect:

_spendingUiState.update { it.copy(overrideSats = it.satsAmount) }
return

[jvsena42]

Related to #229

Description

• Error message improvements
• Max amount specific error message
• Improvement on max amount and quarter button logic
• Improvement on loading logic
• Layout logic cleanup

Preview

transfer_tested.mp4

QA Notes

Tested

• Normal Success flow
• Max amount
• 25%
• Advanced
• Error value higher than max amount
• Error liquidity

[jvsena42]

I'll do the TransferViewModel clean up and Unit tests in other branch to don't obfuscate the fixes from this one

[ovitrif]

Very nice work!

Found only an issue which needs to be addressed IMHO, related to the max amount fee calculation

[ovitrif]

We always get NodeException.InsufficientFunds exception when trying to calculateTotalFee for the entire onChainBalance.

That's the reason I added walletRepo.getMaxSendAmount(), which is not perfect either (I got sometimes failure for the onChainBalance - 1000sat buffer solution), but still much less error-prone:

bitkit-android/app/src/main/java/to/bitkit/repositories/WalletRepo.kt

Lines 318 to 336 in 46d613a

	suspendfungetMaxSendAmount(): ULong= withContext(bgDispatcher) {
	val totalOnchainSats = balanceState.value.totalOnchainSats
	if (totalOnchainSats ==0uL) {
	return@withContext 0uL
	}
	try {
	val minFeeBuffer =1000uL
	val amountSats = (totalOnchainSats - minFeeBuffer).coerceAtLeast(0uL)
	val fee = lightningRepo.calculateTotalFee(amountSats).getOrThrow()
	val maxSendable = (totalOnchainSats - fee).coerceAtLeast(0uL)
	return@withContext maxSendable
	} catch (_:Throwable) {
	Logger.debug("Could not calculate max send amount, using as fallback 90% of total", context =TAG)
	val fallbackMax = (totalOnchainSats.toDouble() *0.9).toULong()
	return@withContext fallbackMax
	}
	}

Much recommended to use the getMaxSendAmount() here as well, that way we won't ALWAYS end up with the DEFAULT_TX_FEE.

PS. I informed @coreyphillips about this issue but it's not the highest priority thus looking into it will be delayed.

[jvsena42]

Much better, though I still get error: Invalid request format when selecting the max amount

[ovitrif]

True, because Invalid request format comes from bitkit-core's http call to Blocktank staging.

[jvsena42]

This PR fixes the bug introduced here

[ovitrif]

Nice refactor, the changed code works good!

Added an remark for improvement, feel free to address outside of this PR though.

Tested

• Normal Success flow
• Max amount
• 25%
• Error value higher than max amount

[ovitrif]

in the RN app, the amount will not update if it would exceed the max limit.

I think we can easily do the same here with this code right after the effect:

_spendingUiState.update { it.copy(overrideSats = it.satsAmount) }
return

[jvsena42]

Related to #229

Description

• Error message improvements
• Max amount specific error message
• Improvement on max amount and quarter button logic
• Improvement on loading logic
• Layout logic cleanup

Preview

transfer_tested.mp4

QA Notes

Tested

• Normal Success flow
• Max amount
• 25%
• Advanced
• Error value higher than max amount
• Error liquidity

[jvsena42]

I'll do the TransferViewModel clean up and Unit tests in other branch to don't obfuscate the fixes from this one

[ovitrif]

Very nice work!

Found only an issue which needs to be addressed IMHO, related to the max amount fee calculation

[ovitrif]

We always get NodeException.InsufficientFunds exception when trying to calculateTotalFee for the entire onChainBalance.

That's the reason I added walletRepo.getMaxSendAmount(), which is not perfect either (I got sometimes failure for the onChainBalance - 1000sat buffer solution), but still much less error-prone:

bitkit-android/app/src/main/java/to/bitkit/repositories/WalletRepo.kt

Lines 318 to 336 in 46d613a

	suspendfungetMaxSendAmount(): ULong= withContext(bgDispatcher) {
	val totalOnchainSats = balanceState.value.totalOnchainSats
	if (totalOnchainSats ==0uL) {
	return@withContext 0uL
	}
	try {
	val minFeeBuffer =1000uL
	val amountSats = (totalOnchainSats - minFeeBuffer).coerceAtLeast(0uL)
	val fee = lightningRepo.calculateTotalFee(amountSats).getOrThrow()
	val maxSendable = (totalOnchainSats - fee).coerceAtLeast(0uL)
	return@withContext maxSendable
	} catch (_:Throwable) {
	Logger.debug("Could not calculate max send amount, using as fallback 90% of total", context =TAG)
	val fallbackMax = (totalOnchainSats.toDouble() *0.9).toULong()
	return@withContext fallbackMax
	}
	}

Much recommended to use the getMaxSendAmount() here as well, that way we won't ALWAYS end up with the DEFAULT_TX_FEE.

PS. I informed @coreyphillips about this issue but it's not the highest priority thus looking into it will be delayed.

[jvsena42]

Much better, though I still get error: Invalid request format when selecting the max amount

[ovitrif]

True, because Invalid request format comes from bitkit-core's http call to Blocktank staging.

[jvsena42]

This PR fixes the bug introduced here

[ovitrif]

Nice refactor, the changed code works good!

Added an remark for improvement, feel free to address outside of this PR though.

Tested

• Normal Success flow
• Max amount
• 25%
• Error value higher than max amount

[ovitrif]

in the RN app, the amount will not update if it would exceed the max limit.

I think we can easily do the same here with this code right after the effect:

_spendingUiState.update { it.copy(overrideSats = it.satsAmount) }
return

[jvsena42]

Related to #229

Description

• Error message improvements
• Max amount specific error message
• Improvement on max amount and quarter button logic
• Improvement on loading logic
• Layout logic cleanup

Preview

transfer_tested.mp4

QA Notes

Tested

• Normal Success flow
• Max amount
• 25%
• Advanced
• Error value higher than max amount
• Error liquidity

[jvsena42]

I'll do the TransferViewModel clean up and Unit tests in other branch to don't obfuscate the fixes from this one

[ovitrif]

Very nice work!

Found only an issue which needs to be addressed IMHO, related to the max amount fee calculation

[ovitrif]

We always get NodeException.InsufficientFunds exception when trying to calculateTotalFee for the entire onChainBalance.

That's the reason I added walletRepo.getMaxSendAmount(), which is not perfect either (I got sometimes failure for the onChainBalance - 1000sat buffer solution), but still much less error-prone:

bitkit-android/app/src/main/java/to/bitkit/repositories/WalletRepo.kt

Lines 318 to 336 in 46d613a

	suspendfungetMaxSendAmount(): ULong= withContext(bgDispatcher) {
	val totalOnchainSats = balanceState.value.totalOnchainSats
	if (totalOnchainSats ==0uL) {
	return@withContext 0uL
	}
	try {
	val minFeeBuffer =1000uL
	val amountSats = (totalOnchainSats - minFeeBuffer).coerceAtLeast(0uL)
	val fee = lightningRepo.calculateTotalFee(amountSats).getOrThrow()
	val maxSendable = (totalOnchainSats - fee).coerceAtLeast(0uL)
	return@withContext maxSendable
	} catch (_:Throwable) {
	Logger.debug("Could not calculate max send amount, using as fallback 90% of total", context =TAG)
	val fallbackMax = (totalOnchainSats.toDouble() *0.9).toULong()
	return@withContext fallbackMax
	}
	}

Much recommended to use the getMaxSendAmount() here as well, that way we won't ALWAYS end up with the DEFAULT_TX_FEE.

PS. I informed @coreyphillips about this issue but it's not the highest priority thus looking into it will be delayed.

[jvsena42]

Much better, though I still get error: Invalid request format when selecting the max amount

[ovitrif]

True, because Invalid request format comes from bitkit-core's http call to Blocktank staging.

[jvsena42]

This PR fixes the bug introduced here

[ovitrif]

Nice refactor, the changed code works good!

Added an remark for improvement, feel free to address outside of this PR though.

Tested

• Normal Success flow
• Max amount
• 25%
• Error value higher than max amount

[ovitrif]

in the RN app, the amount will not update if it would exceed the max limit.

I think we can easily do the same here with this code right after the effect:

_spendingUiState.update { it.copy(overrideSats = it.satsAmount) }
return

[jvsena42]

Related to #229

Description

• Error message improvements
• Max amount specific error message
• Improvement on max amount and quarter button logic
• Improvement on loading logic
• Layout logic cleanup

Preview

transfer_tested.mp4

QA Notes

Tested

• Normal Success flow
• Max amount
• 25%
• Advanced
• Error value higher than max amount
• Error liquidity

[jvsena42]

I'll do the TransferViewModel clean up and Unit tests in other branch to don't obfuscate the fixes from this one

[ovitrif]

Very nice work!

Found only an issue which needs to be addressed IMHO, related to the max amount fee calculation

[ovitrif]

We always get NodeException.InsufficientFunds exception when trying to calculateTotalFee for the entire onChainBalance.

That's the reason I added walletRepo.getMaxSendAmount(), which is not perfect either (I got sometimes failure for the onChainBalance - 1000sat buffer solution), but still much less error-prone:

bitkit-android/app/src/main/java/to/bitkit/repositories/WalletRepo.kt

Lines 318 to 336 in 46d613a

	suspendfungetMaxSendAmount(): ULong= withContext(bgDispatcher) {
	val totalOnchainSats = balanceState.value.totalOnchainSats
	if (totalOnchainSats ==0uL) {
	return@withContext 0uL
	}
	try {
	val minFeeBuffer =1000uL
	val amountSats = (totalOnchainSats - minFeeBuffer).coerceAtLeast(0uL)
	val fee = lightningRepo.calculateTotalFee(amountSats).getOrThrow()
	val maxSendable = (totalOnchainSats - fee).coerceAtLeast(0uL)
	return@withContext maxSendable
	} catch (_:Throwable) {
	Logger.debug("Could not calculate max send amount, using as fallback 90% of total", context =TAG)
	val fallbackMax = (totalOnchainSats.toDouble() *0.9).toULong()
	return@withContext fallbackMax
	}
	}

Much recommended to use the getMaxSendAmount() here as well, that way we won't ALWAYS end up with the DEFAULT_TX_FEE.

PS. I informed @coreyphillips about this issue but it's not the highest priority thus looking into it will be delayed.

[jvsena42]

Much better, though I still get error: Invalid request format when selecting the max amount

[ovitrif]

True, because Invalid request format comes from bitkit-core's http call to Blocktank staging.

[jvsena42]

This PR fixes the bug introduced here

[ovitrif]

Nice refactor, the changed code works good!

Added an remark for improvement, feel free to address outside of this PR though.

Tested

• Normal Success flow
• Max amount
• 25%
• Error value higher than max amount

[ovitrif]

in the RN app, the amount will not update if it would exceed the max limit.

I think we can easily do the same here with this code right after the effect:

_spendingUiState.update { it.copy(overrideSats = it.satsAmount) }
return

[jvsena42]

Related to #229

Description

• Error message improvements
• Max amount specific error message
• Improvement on max amount and quarter button logic
• Improvement on loading logic
• Layout logic cleanup

Preview

transfer_tested.mp4

QA Notes

Tested

• Normal Success flow
• Max amount
• 25%
• Advanced
• Error value higher than max amount
• Error liquidity

[jvsena42]

I'll do the TransferViewModel clean up and Unit tests in other branch to don't obfuscate the fixes from this one

[ovitrif]

Very nice work!

Found only an issue which needs to be addressed IMHO, related to the max amount fee calculation

[ovitrif]

We always get NodeException.InsufficientFunds exception when trying to calculateTotalFee for the entire onChainBalance.

That's the reason I added walletRepo.getMaxSendAmount(), which is not perfect either (I got sometimes failure for the onChainBalance - 1000sat buffer solution), but still much less error-prone:

bitkit-android/app/src/main/java/to/bitkit/repositories/WalletRepo.kt

Lines 318 to 336 in 46d613a

	suspendfungetMaxSendAmount(): ULong= withContext(bgDispatcher) {
	val totalOnchainSats = balanceState.value.totalOnchainSats
	if (totalOnchainSats ==0uL) {
	return@withContext 0uL
	}
	try {
	val minFeeBuffer =1000uL
	val amountSats = (totalOnchainSats - minFeeBuffer).coerceAtLeast(0uL)
	val fee = lightningRepo.calculateTotalFee(amountSats).getOrThrow()
	val maxSendable = (totalOnchainSats - fee).coerceAtLeast(0uL)
	return@withContext maxSendable
	} catch (_:Throwable) {
	Logger.debug("Could not calculate max send amount, using as fallback 90% of total", context =TAG)
	val fallbackMax = (totalOnchainSats.toDouble() *0.9).toULong()
	return@withContext fallbackMax
	}
	}

Much recommended to use the getMaxSendAmount() here as well, that way we won't ALWAYS end up with the DEFAULT_TX_FEE.

PS. I informed @coreyphillips about this issue but it's not the highest priority thus looking into it will be delayed.

[jvsena42]

Much better, though I still get error: Invalid request format when selecting the max amount

[ovitrif]

True, because Invalid request format comes from bitkit-core's http call to Blocktank staging.

[jvsena42]

This PR fixes the bug introduced here

[ovitrif]

Nice refactor, the changed code works good!

Added an remark for improvement, feel free to address outside of this PR though.

Tested

• Normal Success flow
• Max amount
• 25%
• Error value higher than max amount

[ovitrif]

in the RN app, the amount will not update if it would exceed the max limit.

I think we can easily do the same here with this code right after the effect:

_spendingUiState.update { it.copy(overrideSats = it.satsAmount) }
return

[jvsena42]

Related to #229

Description

• Error message improvements
• Max amount specific error message
• Improvement on max amount and quarter button logic
• Improvement on loading logic
• Layout logic cleanup

Preview

transfer_tested.mp4

QA Notes

Tested

• Normal Success flow
• Max amount
• 25%
• Advanced
• Error value higher than max amount
• Error liquidity

[jvsena42]

I'll do the TransferViewModel clean up and Unit tests in other branch to don't obfuscate the fixes from this one

[ovitrif]

Very nice work!

Found only an issue which needs to be addressed IMHO, related to the max amount fee calculation

[ovitrif]

We always get NodeException.InsufficientFunds exception when trying to calculateTotalFee for the entire onChainBalance.

That's the reason I added walletRepo.getMaxSendAmount(), which is not perfect either (I got sometimes failure for the onChainBalance - 1000sat buffer solution), but still much less error-prone:

bitkit-android/app/src/main/java/to/bitkit/repositories/WalletRepo.kt

Lines 318 to 336 in 46d613a

	suspendfungetMaxSendAmount(): ULong= withContext(bgDispatcher) {
	val totalOnchainSats = balanceState.value.totalOnchainSats
	if (totalOnchainSats ==0uL) {
	return@withContext 0uL
	}
	try {
	val minFeeBuffer =1000uL
	val amountSats = (totalOnchainSats - minFeeBuffer).coerceAtLeast(0uL)
	val fee = lightningRepo.calculateTotalFee(amountSats).getOrThrow()
	val maxSendable = (totalOnchainSats - fee).coerceAtLeast(0uL)
	return@withContext maxSendable
	} catch (_:Throwable) {
	Logger.debug("Could not calculate max send amount, using as fallback 90% of total", context =TAG)
	val fallbackMax = (totalOnchainSats.toDouble() *0.9).toULong()
	return@withContext fallbackMax
	}
	}

Much recommended to use the getMaxSendAmount() here as well, that way we won't ALWAYS end up with the DEFAULT_TX_FEE.

PS. I informed @coreyphillips about this issue but it's not the highest priority thus looking into it will be delayed.

[jvsena42]

Much better, though I still get error: Invalid request format when selecting the max amount

[ovitrif]

True, because Invalid request format comes from bitkit-core's http call to Blocktank staging.

[jvsena42]

This PR fixes the bug introduced here

[ovitrif]

Nice refactor, the changed code works good!

Added an remark for improvement, feel free to address outside of this PR though.

Tested

• Normal Success flow
• Max amount
• 25%
• Error value higher than max amount

[ovitrif]

in the RN app, the amount will not update if it would exceed the max limit.

I think we can easily do the same here with this code right after the effect:

_spendingUiState.update { it.copy(overrideSats = it.satsAmount) }
return