Skip to content

fix(perps): use position-specific failure titles #6494

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 1 commit into
base: master
Choose a base branch
from
Open

fix(perps): use position-specific failure titles #6494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion ...in/java/one/mixin/android/ui/home/web3/trade/perps/PerpsCloseBottomSheetDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ class PerpsCloseBottomSheetDialogFragment : MixinComposeBottomSheetDialogFragmen
private val positionId by lazy {
requireNotNull(requireArguments().getString(ARGS_POSITION_ID)) { "positionId is null" }
}
private val isLong by lazy {
requireNotNull(requireArguments().getString(ARGS_SIDE)) { "side is null" }
.equals("long", ignoreCase = true)
}

private val margin by lazy {
requireNotNull(requireArguments().getString(ARGS_MARGIN)) { "margin is null" }
Expand Down Expand Up @@ -308,7 +312,7 @@ class PerpsCloseBottomSheetDialogFragment : MixinComposeBottomSheetDialogFragmen
id = when (step) {
Step.Pending -> R.string.confirm_closing_position
Step.Done -> R.string.Position_Closed
Step.Error -> R.string.swap_failed
Step.Error -> if (isLong) R.string.Closed_Long_Failed else R.string.Closed_Short_Failed
Step.Sending -> R.string.Sending
}
),
Expand Down
7 changes: 6 additions & 1 deletion .../java/one/mixin/android/ui/home/web3/trade/perps/PerpsConfirmBottomSheetDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,12 @@ class PerpsConfirmBottomSheetDialogFragment : MixinComposeBottomSheetDialogFragm
id = when (step) {
Step.Pending -> if (isAddPosition) R.string.confirm_adding_position else R.string.confirm_opening_position
Step.Done -> if (isAddPosition) R.string.Position_Add_Submitted else R.string.Position_Submitted
Step.Error -> R.string.swap_failed
Step.Error -> when {
isAddPosition && isLong -> R.string.Added_Long_Failed
isAddPosition -> R.string.Added_Short_Failed
isLong -> R.string.Opened_Long_Failed
else -> R.string.Opened_Short_Failed
}
Step.Sending -> R.string.Sending
}
),
Expand Down