Skip to content
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

Jump to bottom

Merge to main (1.0.1) #88

Merged
merged 64 commits into from
Apr 30, 2024
Merged

Merge to main (1.0.1) #88

merged 64 commits into from
Apr 30, 2024

Conversation

ruixhuang
Copy link
Contributor

No description provided.

prashanDYDX and others added 30 commits March 12, 2024 15:36
@prashanDYDX
Update .gitignore to ignore all .idea files and all build directories. (
03422e4 
#20)
@prashanDYDX
Turn on Gradle parallel execution and caching.
8206789
@ruixhuang
Add "app_deployment" key (#21)
9b4720e 
* Add "app_deployment" key

* Lint
@prashanDYDX
Initial setup of StrictMode - only logging in debug. (#22)
9a5ff0a 
* Initial setup of StrictMode - only logging in debug.

* Revert injection changes
@prashanDYDX
Use limitedParallelism and MainScope() in AbacusThreadingImp. (#25)
bfaedb7
@ruixhuang
Handle exception with invalid URLs (#26)
6a07df2
@ruixhuang
MOB-348 Show Squid routing error on deposit/withdrawal (#28)
cf3d37a
@prashanDYDX
Update AppModule.kt and used dependencies to follow Dagger Best Pract…
a6adc3b 
…ices guide (in Notion). (#27)
@ruixhuang
Correlate x-request-id to correlate route requests from Squid transac…
948d1dd 
…tions (#23)
@ruixhuang
Fix build (#29)
6465dc6
@ruixhuang
MOB-362: Some url links don't work with the deployment build (#31)
4ec10a7 
* Test

* Check for deeplink path during routing

* Clean up

* Clean up
@prashanDYDX
Update rest of Dagger modules to follow best practices. (#30)
fad8804
@ruixhuang
Remove network selector from settings for release build (#33)
1ceea81
@ruixhuang
MOB-363: Android: "System" theme setting not working (#32)
885b278 
* Observe system theme

* Recompose when theme changes
@ruixhuang
Fix a crash on url tapping (#34)
98b9fc9
@ruixhuang
Remove hardcoded scheme in the setting links. (#35)
2015769
@prashanDYDX
Add Firebase Performance monitoring. (#37)
102d1c8
@ruixhuang
Bump Abacus and update the system link. (#36)
aa3bcd6
@ruixhuang
Fix the release build issue of wallet amount not showing up on deposit (
14c0675 
#38)
@ruixhuang
Fix Subaccount transfer for France (#39)
0f36547 
* Fix Subaccount transfer for France

* Lint

* Update function name to be consistent with iOS
@ruixhuang
Clean up the start-up sequence (#41)
c09f3a5 
* Clean up the start-up sequence

* Lint
@ruixhuang
Update Cartera and WalletConnnect to the latest version (#40)
a158ab5 
* Update Cartera

* Lint

* Add comments
@ruixhuang
MOB-285: Call startTrade() after setMarket() (#43)
414cd03
@ruixhuang
Update the v4-native-client.js to replace # with ___ (#42)
d74f70c 
* Add script

* Update v4-client.js

* Safer replacement

* Safer replacement
@ruixhuang
Move startWorkers back to Activity.onCreate() (#44)
8ea0afe 
* Move startWorkers back to Activity.start()

* Comment
@ruixhuang
MOB-410 Add tracking for onboarding, transfer, wallet connection (#46)
32e3968 
* Adding Onboarding/Transfer/Wallet events

* Add userID and userProperties

* Optimiazation
@ruixhuang
Add link to send logcat messages via email (#45)
bd5ce3e 
* Add link to send logcat messages via email

* Clean up

* Error handling

* Make file provider depending on applicationId
@johnqh
MOB-432 previous branch was based on a wrong branch (#48)
075f5b6 
* MOB-432 previous branch was based on a wrong branch

* PR
@ruixhuang
Bump Abacus (#50)
6d5866b 
* Bump Abacus

* Revert
@ruixhuang
MOB-421 add settings control to turn in-app notifications on/off comp…
6e53a93 
…letely (#49)

* MOB-421 add settings control to turn in-app notifications on/off completely

* MOB-421 add settings control to turn in-app notifications on/off completely

* Clean up
johnqh and others added 26 commits April 5, 2024 14:08
@johnqh
Feature/mob 257 weekly dates (#61)
48822ed 
* Added end time to rewards date range

* lint
@prashanDYDX
Update SharingStarted usages from Lazily to WhileSubscribed(). (#62)
de98092
@ruixhuang
Fix issue of text input losing calculated value when not focused (#64)
0ffc8e3
@prashanDYDX
Inject coroutine scopes and dispatchers instead of hardcoding. (#65)
41f045b
@ruixhuang
Revert "Update SharingStarted usages from Lazily to WhileSubscribed(). (
252e95d 
#62)" (#66)

This reverts commit de98092.
@ruixhuang
Fix margin issues with portfolio position items (#67)
68c881b
@ruixhuang
Fix threading issue (#68)
84036b5
@ruixhuang
Bump Abacus and v4-client (#69)
d8b2274
@ruixhuang
MOB-440 TP/SL order submission and data binding (#63)
d97a8f7 
* Wire up input data

* Submission

* WIP

* Bump Abacus and toggle size section

* Update PlatformInfoScaffold

* submissionStatus = _submissionStatus

* Simplify TriggerOrderStream
@ruixhuang
Fix an issue of order/fill status display (#72)
ecb0e34
@prashanDYDX
Fix dollar() formatting crash in FR locale. (#74)
f3c1152
@ruixhuang
Add formatting functions for size specified in double (1000.0, 0.001,… (
808a307 
#73)

* Add formatting functions for size specified in double (1000.0, 0.001, etc)

* Clean up

* Clean up

* Clean up BigDecimals

* Remove rounded(bigDecimal:
@ruixhuang
Fix rounding issue on leverage slider when locale is French (#75)
45a118b
@ruixhuang
MOB-441 add TP/SL display to market screen (Android) (#71)
511c9c2 
* Wire up input data

* Submission

* WIP

* Bump Abacus and toggle size section

* MarketInfo buttons

* Clean up

* Clean up TriggerOrderStream
@ruixhuang
MOB-442 Support error states for TP/SL inputs (#77)
9572c2f 
* Wire up input data

* Submission

* WIP

* Bump Abacus and toggle size section

* MarketInfo buttons

* Validation

* Show validation error at sections

* Highlighting error/warning field

* Slide size formatting

* Clean up

* Clean up TriggerOrderStream

* Clean up

* Clean up
@ruixhuang
Made localizer a computed property (#78)
5829a09
@ruixhuang
MOB-455 Add retry to trade and close order submission (#76)
0940328 
* Add retry to trade and close order submission.

* _submissionStatus.asStateFlow()
@prashanDYDX
Turn on Kotlin incremental classpath snapshots. (#80)
3f0096b
@ruixhuang
Fixing threading issues (#79)
4f6309c 
* Fixing threading issues.

* Clean up
@johnqh
Feature/mob 360 target leverage (#59)
be6f656 
* Margin type and leverage screens skeleton

* MOB-356 MOB-358 Margin mode screen

* Change bg color

* MOB-360 rough UX for target leverage screen

* Fixed PR

* move modifier to param

* lint

* There is no longer InputFieldScarfold

* Put back InputFieldScaffold
@ruixhuang
Fix market info's stats/about tab animation issue (#83)
dcdb8f8
@ruixhuang
MOB-14 Disable sparkline touching on market list (#84)
7c49afa 
* Disable sparkline touching on market list

* Clean up
@ruixhuang
Bump version (#81)
33ba783
@ruixhuang
Bump Abacus and add script to use locally built Abacus (#86)
04852bf 
* Bump Abacus and add script to use locally built Abacus

* Usage

* Update
@johnqh
Feature/mob 400 adjust margin screen (#85)
2239315 
* Margin type and leverage screens skeleton

* MOB-356 MOB-358 Margin mode screen

* Change bg color

* MOB-360 rough UX for target leverage screen

* Fixed PR

* move modifier to param

* In the middle of coding

* lint

* There is no longer InputFieldScarfold

* Put back InputFieldScaffold

* More placeholder code and it compiles

* rough amount input

* Formatting "Add Margin" and "Remove Margin"
@ruixhuang
Merge branch 'develop' into features/merge_to_main
8c6963c 
# Conflicts:
#	gradle.properties
#	v4/build.gradle
#	v4/common/src/main/java/exchange/dydx/trading/common/formatter/DydxFormatter.kt
#	v4/common/src/main/java/exchange/dydx/trading/common/navigation/DydxRoutes.kt
#	v4/common/src/test/java/exchange/dydx/common/formatter/DydxFormatterTests.kt
#	v4/core/src/main/java/exchange/dydx/trading/TradingActivity.kt
#	v4/feature/market/src/main/java/exchange/dydx/trading/feature/market/marketinfo/components/position/DydxMarketPositionButtonsView.kt
#	v4/feature/market/src/main/java/exchange/dydx/trading/feature/market/marketinfo/components/position/DydxMarketPositionButtonsViewModel.kt
#	v4/feature/portfolio/src/main/java/exchange/dydx/trading/feature/portfolio/components/positions/DydxPortfolioPositionItemView.kt
#	v4/feature/receipt/src/main/java/exchange/dydx/trading/feature/receipt/validation/DydxValidationView.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/DydxTradeRouter.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/di/TradeModule.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/streams/TradeStream.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/tradeinput/DydxTradeInputMarginModeView.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/tradeinput/DydxTradeInputMarginModeViewModel.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/tradeinput/DydxTradeInputTargetLeverageView.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/tradeinput/DydxTradeInputTargetLeverageViewModel.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/trigger/DydxTriggerOrderInputView.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/trigger/DydxTriggerOrderInputViewModel.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/trigger/components/DydxTriggerOrderCtaButtonView.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/trigger/components/DydxTriggerOrderCtaButtonViewModel.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/trigger/components/DydxTriggerOrderReceiptViewModel.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/trigger/components/inputfields/gainloss/DydxTriggerOrderGainLossView.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/trigger/components/inputfields/gainloss/DydxTriggerOrderGainLossViewModel.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/trigger/components/inputfields/limitprice/DydxTriggerOrderLimitPriceSectionViewModel.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/trigger/components/inputfields/price/DydxTriggerOrderPriceView.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/trigger/components/inputfields/price/DydxTriggerOrderPriceViewModel.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/trigger/components/inputfields/size/DydxTriggerOrderSizeView.kt
#	v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/trigger/components/inputfields/size/DydxTriggerOrderSizeViewModel.kt
#	v4/integration/dydxStateManager/src/main/java/exchange/dydx/dydxstatemanager/AbacusState.kt
#	v4/integration/dydxStateManager/src/main/java/exchange/dydx/dydxstatemanager/AbacusStateManager.kt
#	v4/integration/dydxStateManager/src/main/java/exchange/dydx/dydxstatemanager/protocolImplementations/AbacusThreadingImp.kt
@ruixhuang ruixhuang changed the title Merge to main Merge to main (1.0.1) Apr 30, 2024
@ruixhuang ruixhuang merged commit 7f33b31 into main Apr 30, 2024
3 checks passed
@ruixhuang ruixhuang deleted the features/merge_to_main branch April 30, 2024 18:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@prashanDYDX prashanDYDX prashanDYDX approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ruixhuang @prashanDYDX @johnqh