-
Notifications
You must be signed in to change notification settings - Fork 3
feat: send flow design updates v60 #863
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.
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
Merged
Changes from 14 commits
Commits
Show all changes
65 commits
Select commit
Hold shift + click to select a range
7b39466
feat: string resources
jvsena42 77cd683
feat: SendSectionView
jvsena42 ad62cea
feat: add swipe progress callback to SwipeToConfirm
jvsena42 ef35e2c
feat: add Instant enum type
jvsena42 7f37c8c
feat: update SendFeeViewModel Custom Fee Defaults. to: current custom…
jvsena42 7ccab2d
feat: switch to lighting when selecting instant
jvsena42 fe98cdc
feat: relative expire date for invoice
jvsena42 8a67ab0
feat: hide details on send confirmation screen
jvsena42 204e1dd
test: update test
jvsena42 d62e6cd
chore: lint
jvsena42 8d8fa26
Merge branch 'feat/settings-v60' into feat/send-v60
jvsena42 7c94de7
Merge branch 'feat/settings-v60' into feat/send-v60
jvsena42 bd59b6e
fix: spacing
jvsena42 d5fc1a1
fix: switch logic
jvsena42 d5687db
fix: coin animation
jvsena42 0b8e70a
fix: reset warnings on amount change and payment method switches
jvsena42 2bbad48
fix: strings order
jvsena42 9c84c60
fix: expire text update
jvsena42 b183d31
fix: apply side effect
jvsena42 f1cdb2c
fix: remove trailing comma
jvsena42 e2fb696
fix: remove trailing comma
jvsena42 978a51c
Merge branch 'feat/settings-v60' into feat/send-v60
jvsena42 c8da9c2
fix: clean confirmedWarnings when switch to lighting
jvsena42 85600dd
chore: lint
jvsena42 49ed094
chore: remove magic number
jvsena42 95f856c
chore: modifier rule lint
jvsena42 c95b053
chore: magic number
jvsena42 1bee2de
feat: dashed add button
jvsena42 3b80a36
feat: horizontal swipe
jvsena42 34f2503
fix: dust validation on updateCanSwitchWallet
jvsena42 0a1d121
Merge branch 'feat/settings-v60' into feat/send-v60
jvsena42 21ff423
fix: tags section padding
jvsena42 0224d21
fix: don't hide LNURL details
jvsena42 764b71a
fix: replace gradient BG with White06
jvsena42 702863d
doc: changelog entry
jvsena42 3f5e94d
Merge branch 'feat/settings-v60' into feat/send-v60
jvsena42 32610e2
doc: changelog entry
jvsena42 cc9d1f2
chore: code cleanup
jvsena42 fc5a38e
chore: set modifier as last parameter
jvsena42 057112c
refactor: eliminate unsafe cast
jvsena42 3b2b96b
Merge branch 'feat/settings-v60' into feat/send-v60
jvsena42 0e39602
fix: update text
jvsena42 684a46c
fix: AddTagButton color
jvsena42 f2cef84
fix: call updateCanSwitchWallet for fixed amount invoice
jvsena42 3a741c6
fix: disable instant option when not possible to switch to lighting
jvsena42 d155c4d
fix: fee estimates not loaded when navigating from lightning
jvsena42 f92708f
chore: make ContentRunning private
jvsena42 a74778d
Merge branch 'master' into feat/send-v60
jvsena42 7a6c9ce
fix: tag text color
jvsena42 af32125
fix: instant icon
jvsena42 fabfde3
fix: fixed-amount path missing estimateLightningRoutingFeesIfNeeded
jvsena42 2c5e2af
fix: instant fee description
jvsena42 70d07bf
fix: refreshFeeEstimates unconditionally overwriting fee with SendFee…
jvsena42 da24a7e
test: prevent regressions on send flow
jvsena42 39cd7a6
fix: lighting fee state override to zero when selecting on-chain
jvsena42 4eed0a3
chore: replace wheneverBlocking
jvsena42 e70e9fc
chore: lint
jvsena42 794f5e2
Merge branch 'master' into feat/send-v60
jvsena42 bffaa57
chore: update changelog rule
jvsena42 7312e09
chore: update changelog entrie to match Agentes rule
jvsena42 9dbc7b7
refactor: remove section comments
jvsena42 5a567e0
refactor: mock declaration
jvsena42 a6641f4
refactor: rename component and add preview
jvsena42 e50948c
doc: consolidate changelog entries
jvsena42 49518e8
Update app/src/test/java/to/bitkit/viewmodels/AppViewModelSendFlowTes…
jvsena42 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
24 changes: 24 additions & 0 deletions
24
app/src/main/java/to/bitkit/ui/components/SendSectionView.kt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package to.bitkit.ui.components | ||
|
|
||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.material3.HorizontalDivider | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.unit.dp | ||
| import to.bitkit.ui.theme.Colors | ||
|
|
||
| @Composable | ||
| fun SendSectionView( | ||
| caption: String, | ||
| modifier: Modifier = Modifier, | ||
| content: @Composable () -> Unit, | ||
| ) { | ||
| Column(modifier = modifier.fillMaxWidth()) { | ||
| Caption13Up(text = caption, color = Colors.White64) | ||
| VerticalSpacer(8.dp) | ||
| content() | ||
| VerticalSpacer(16.dp) | ||
| HorizontalDivider(modifier = Modifier.fillMaxWidth()) | ||
| } | ||
| } | ||
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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.