Feat/perps tpsl bottom sheet#6369
Merged
Merged
Conversation
Remove all $, USDT, and fiat conversion from the perpetual contracts trading UI. All amounts now display as plain numbers without currency symbols or fiat rate conversion. - Add formatPerpsSignedDecimal() to PerpsFormat.kt - Add perps_tpsl_* and perps_liquidation_* string resources (EN + CN) - Restore PerpsTpSlBottomSheetDialogFragment with no currency symbols - Update 12 files to remove fiatSymbol, fiatRate, and $ prefixes
SeniorZhai
force-pushed
the
feat/perps-tpsl-bottom-sheet
branch
from
0a8d087 to
1308a68
Compare
Member
Author
|
@copilot resolve the merge conflicts in this pull request |
Co-authored-by: SeniorZhai <5416585+SeniorZhai@users.noreply.github.com>
Contributor
Done — I merged the latest Warning Firewall rules blocked me from connecting to one or more addresses (expand for details)I tried to connect to the following addresses, but was blocked by firewall rules:
If you need me to access, download, or install something from one of these locations, you can either:
|
…l-removal # Conflicts: # app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsConfirmBottomSheetDialogFragment.kt # app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsFormat.kt # app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsMarketDetailPage.kt # app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsMarketItem.kt # app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsMarketListAdapter.kt # app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsPositionShareActivity.kt
…om-sheet # Conflicts: # app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/OpenPositionPage.kt # app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsCloseBottomSheetDialogFragment.kt # app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsMarketDetailPage.kt
SeniorZhai
force-pushed
the
feat/perps-tpsl-bottom-sheet
branch
from
7fccfa4 to
974801d
Compare
…tom-sheet # Conflicts: # app/src/main/java/one/mixin/android/ui/home/web3/trade/ClosedPositionAdapter.kt # app/src/main/java/one/mixin/android/ui/home/web3/trade/ClosedPositionItem.kt # app/src/main/java/one/mixin/android/ui/home/web3/trade/TotalPositionValueAdapter.kt # app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/OpenPositionAdapter.kt # app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/OpenPositionItem.kt # app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/OpenPositionPage.kt # app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsFormat.kt # app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsMarketDetailPage.kt
SeniorZhai
force-pushed
the
feat/perps-tpsl-bottom-sheet
branch
from
255e287 to
290096b
Compare
…tent and tip icons
SeniorZhai
force-pushed
the
feat/perps-tpsl-bottom-sheet
branch
from
c3b0d7b to
703cb02
Compare
…ps-tpsl-bottom-sheet
SeniorZhai
force-pushed
the
feat/perps-tpsl-bottom-sheet
branch
from
3f5a4b6 to
f89d326
Compare
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
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.
No description provided.