MOB-452 : add cta button to submit trades #139
Merged
Conversation
This file contains 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
mike-dydx
commented
Apr 10, 2024
| self?.updateValidationErrors(errors) | ||
| .sink { [weak self] triggerOrdersInput, errors in | ||
| #if DEBUG | ||
| if let triggerOrdersInput { |
There was a problem hiding this comment.
will remove this in the future
mike-dydx
commented
Apr 10, 2024
Comment on lines
135
to
160
| private func update(triggerOrdersInput: TriggerOrdersInput?, errors: [ValidationError]) { | ||
|
|
||
| viewModel?.takeProfitStopLossInputAreaViewModel?.takeProfitAlert = nil | ||
| viewModel?.takeProfitStopLossInputAreaViewModel?.stopLossAlert = nil | ||
|
|
||
| for error in errors { | ||
| let alert = InlineAlertViewModel(.init(title: error.resources.title?.localized, body: error.resources.text?.localized, level: .error)) | ||
| switch error.code { | ||
| case "TRIGGER_MUST_ABOVE_INDEX_PRICE": | ||
| print("mmm: \(error)") | ||
| if triggerOrdersInput?.stopLossOrder?.side == .buy { | ||
| viewModel?.takeProfitStopLossInputAreaViewModel?.stopLossAlert = alert | ||
| } | ||
| if triggerOrdersInput?.takeProfitOrder?.side == .sell { | ||
| viewModel?.takeProfitStopLossInputAreaViewModel?.takeProfitAlert = alert | ||
| } | ||
| case "TRIGGER_MUST_BELOW_INDEX_PRICE": | ||
| print("mmm: \(error)") | ||
| if triggerOrdersInput?.stopLossOrder?.side == .sell { | ||
| viewModel?.takeProfitStopLossInputAreaViewModel?.stopLossAlert = alert | ||
| } | ||
| if triggerOrdersInput?.takeProfitOrder?.side == .buy { | ||
| viewModel?.takeProfitStopLossInputAreaViewModel?.takeProfitAlert = alert | ||
| } | ||
| default: | ||
| print("mmm: ", error.code) |
There was a problem hiding this comment.
@ruixhuang here is the error display logic
ruixhuang
reviewed
Apr 12, 2024
| if let error = errors.first { | ||
| viewModel?.submissionReadiness = .fixErrors(cta: error.resources.action?.localized) | ||
| } else if triggerOrdersInput?.takeProfitOrder?.price?.triggerPrice?.doubleValue == nil | ||
| && triggerOrdersInput?.takeProfitOrder?.orderId == nil |
There was a problem hiding this comment.
I am not doing this check on Android. It seems to ready for submission if there is no ValidationError.
There was a problem hiding this comment.
went over this with mulan today, without this check, the "Add triggers" button is enabled even with empty input. I don't think that is great UX, what do you think?
We discussed adding something to abacus like containsChanges to denote whether that button should be enabled or not, even with no errors
ruixhuang
reviewed
Apr 12, 2024
| let alert = InlineAlertViewModel(.init(title: error.resources.title?.localized, body: error.resources.text?.localized, level: .error)) | ||
| switch error.code { | ||
| case "TRIGGER_MUST_ABOVE_INDEX_PRICE": | ||
| print("mmm: \(error)") |
There was a problem hiding this comment.
FYI, the "error.fields" should now contains the TriggerOrdersInputField where the error occurs.. It's probably easier to check for that.
There was a problem hiding this comment.
👍 i will do that in a follow up PR
ruixhuang
reviewed
Apr 12, 2024
| let buttonState: PlatformButtonState | ||
| switch submissionReadiness { | ||
| case .readyToSubmit: | ||
| buttonText = DataLocalizer.shared?.localize(path: "APP.TRADE.ADD_TRIGGERS", params: nil) ?? "" |
There was a problem hiding this comment.
We'd also need an "Edit Trigger" in addition to "Add Trigger".
ruixhuang
approved these changes
Apr 12, 2024
mike-dydx
added a commit
that referenced
this pull request
Aug 20, 2024
* bump 1.6.36 -> 1.6.38 * some ui * add label accessory to platform input, split out input views into view models * clean up * add cta button * hook up button and button states * abacus? * clean up * add case handling for USER_MAX_ORDERS
mike-dydx
added a commit
that referenced
this pull request
Aug 21, 2024
* bump 1.6.36 -> 1.6.38 * some ui * add label accessory to platform input, split out input views into view models * clean up * add cta button * hook up button and button states * abacus? * clean up * add case handling for USER_MAX_ORDERS
mike-dydx
added a commit
that referenced
this pull request
Aug 21, 2024
* bump 1.6.36 -> 1.6.38 * some ui * add label accessory to platform input, split out input views into view models * clean up * add cta button * hook up button and button states * abacus? * clean up * add case handling for USER_MAX_ORDERS
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.
Links (dYdX Internal Use Only)
Linear Ticket: MOB-452 : add cta button to submit trades
Figma Design: https://www.figma.com/file/mKevZOfE9nj6MZpiolKYW1/dYdX-%E2%80%BA-Mobile?type=design&node-id=5621-13681&mode=design&t=yQplL4xfSnUqF508-4
Description / Intuition
Before/After Screenshots or Videos
Untitled.mov
Type of Change