refactor: custom numberpad #370
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
ovitrif
force-pushed
the
fix/custom-numpad
branch
from
8209f6d to
28a4aea
Compare
app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveAmountScreen.kt
Fixed
Show fixed
Hide fixed
ovitrif
force-pushed
the
fix/custom-numpad
branch
from
28a4aea to
83b533b
Compare
ovitrif
force-pushed
the
fix/custom-numpad
branch
from
83b533b to
5bfc25a
Compare
ovitrif
force-pushed
the
fix/custom-numpad
branch
from
5bfc25a to
3bec3ff
Compare
# Conflicts: # app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt # app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
jvsena42
reviewed
Sep 15, 2025
jvsena42
reviewed
Sep 15, 2025
Comment on lines
+181
to
188
| fun getCurrentRate(currency: String): FxRate { | ||
| val rates = _currencyState.value.rates | ||
| val rate = rates.firstOrNull { it.quote == currency } | ||
|
|
||
| fun getCurrentRate(currency: String): FxRate? { | ||
| return _currencyState.value.rates.firstOrNull { it.quote == currency } | ||
| return checkNotNull(rate) { | ||
| "Rate not found for currency: $currency in: ${rates.joinToString { it.quote }}" | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
- This could cause a crash if not inside a method with exception handling, but I saw that it is handled in all called places
- Could also be private, but I see it has been used in tests
So, it is OK for me to keep like this
Collaborator
Author
There was a problem hiding this comment.
This could cause a crash if not inside a method with exception handling, but I saw that it is handled in all called places
TY 👍🏻
Would make sense to make it private or expose only for testing; then it should be ok for it to throw.
jvsena42
approved these changes
Sep 15, 2025
Member
jvsena42
left a comment
jvsena42
left a comment
There was a problem hiding this comment.
Nice refactor!
Tested the same flows + starting the app offline to check for crashes in a Mi A2
optional for future: could add a long press action to the NumberPadDeleteButton button
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes: #309
Closes: #310
This PR refactors the custom numeric keyboard and its associated view for amount display.
Description
Keyboardcomponent with newNumberPadwritten from scratchNext steps:
AmountInputusages with the newNumberPad(ie. replace OS keyboard with custom one)NumberPadSimpleused to for pin input withNumberPad(type = NumberPadType.SIMPLE)Preview
modernSend.mp4
classicTransfer.mp4
QA Notes
AmountInputViewModelTestTests
0.00✓0., tap delete twice → entire input value deleted ✓.→ input value =0.✓0., tap delete twice → expect entire value deleted.→ expect0.as valueregression: numpad in each flow:SendAmountScreen: send > amountReceiveAmountScreen: on wallet wo. LN >receive > tap receive on LN switchEditInvoiceScreen: receive > editSpendingAmountScreen: transfer to spendingregression: edit invoice:regression: pin input::