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.

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

Merge 1.0.3 to Main #119

Merged
merged 91 commits into from
May 23, 2024
Merged

Merge 1.0.3 to Main #119

merged 91 commits into from
May 23, 2024

Conversation

ruixhuang
Copy link
Contributor

No description provided.

prashanDYDX and others added 30 commits March 12, 2024 15:36
* Add "app_deployment" key

* Lint
* Initial setup of StrictMode - only logging in debug.

* Revert injection changes
* Test

* Check for deeplink path during routing

* Clean up

* Clean up
* Observe system theme

* Recompose when theme changes
* Fix Subaccount transfer for France

* Lint

* Update function name to be consistent with iOS
* Clean up the start-up sequence

* Lint
* Add script

* Update v4-client.js

* Safer replacement

* Safer replacement
* Move startWorkers back to Activity.start()

* Comment
* Adding Onboarding/Transfer/Wallet events

* Add userID and userProperties

* Optimiazation
* Add link to send logcat messages via email

* Clean up

* Error handling

* Make file provider depending on applicationId
* MOB-432 previous branch was based on a wrong branch

* PR
* Bump Abacus

* Revert
…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
ruixhuang and others added 27 commits May 1, 2024 16:16
* MOB-469: Add basic order lines to market chart

* Only display open orders.
* Clean up SL/TP

* Cleanup
* 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"

* MOB-400 placeholder for bottom

* Adjust margin receipt area

* MOB-400 rearranging receipt data

* MOB-400 liquidation price

* Fix copy and modified code

* PR review

* spotless

* fix build
* Set margin type into tradeInput

* Layout changes

* Update Abacus

* Fine tuning Isolated margin trade input

* Margin dialog fine tuning
* WIP

* Timber

* Use Logging with consistency

* Cleanup

* Clean up

* Clean up

* Lint
* UX working

* Sync up text formatting

* Update Abacus

* compile issue
* Stop app from exiting at region restriction

* Not showing the button

* Lint
* Stop app from exiting at region restriction

* Not showing the button

* Lint

* Force TESTNET when user debugging is enabled.

* Force deployment web host

* Fix URL

* Clean up

* Made ethereumAddress null instead empty string

* Update version to 1.0.2

* Increase heap size

* Update from TESTNET to TESTFLIGHT
# Conflicts:
#	v4/app/build.gradle
#	v4/core/src/main/java/exchange/dydx/trading/TradingActivity.kt
#	v4/core/src/main/java/exchange/dydx/trading/core/DydxRouterImpl.kt
#	v4/feature/workers/src/main/java/exchange/dydx/trading/feature/workers/DydxGlobalWorkers.kt
#	v4/integration/analytics/src/main/java/exchange/dydx/trading/integration/analytics/tracking/AmplitudeTracker.kt
#	v4/integration/analytics/src/main/java/exchange/dydx/trading/integration/analytics/tracking/CompositeTracker.kt
#	v4/integration/analytics/src/main/java/exchange/dydx/trading/integration/analytics/tracking/FirebaseTracker.kt
@ruixhuang ruixhuang merged commit c998fb3 into main May 23, 2024
3 checks passed
@ruixhuang ruixhuang deleted the feature/merge_to_main2 branch May 23, 2024 17:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants