Feature/mob 497 integration margin type #102
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
…in-trade-input-integration
ruixhuang
approved these changes
May 13, 2024
johnqh
added a commit
that referenced
this pull request
May 21, 2024
* Update .gitignore to ignore all .idea files and all build directories. (#20) * Turn on Gradle parallel execution and caching. * Add "app_deployment" key (#21) * Add "app_deployment" key * Lint * Initial setup of StrictMode - only logging in debug. (#22) * Initial setup of StrictMode - only logging in debug. * Revert injection changes * Use limitedParallelism and MainScope() in AbacusThreadingImp. (#25) * Handle exception with invalid URLs (#26) * MOB-348 Show Squid routing error on deposit/withdrawal (#28) * Update AppModule.kt and used dependencies to follow Dagger Best Practices guide (in Notion). (#27) * Correlate x-request-id to correlate route requests from Squid transactions (#23) * Fix build (#29) * MOB-362: Some url links don't work with the deployment build (#31) * Test * Check for deeplink path during routing * Clean up * Clean up * Update rest of Dagger modules to follow best practices. (#30) * Remove network selector from settings for release build (#33) * MOB-363: Android: "System" theme setting not working (#32) * Observe system theme * Recompose when theme changes * Fix a crash on url tapping (#34) * Remove hardcoded scheme in the setting links. (#35) * Add Firebase Performance monitoring. (#37) * Bump Abacus and update the system link. (#36) * Fix the release build issue of wallet amount not showing up on deposit (#38) * Fix Subaccount transfer for France (#39) * Fix Subaccount transfer for France * Lint * Update function name to be consistent with iOS * Clean up the start-up sequence (#41) * Clean up the start-up sequence * Lint * Update Cartera and WalletConnnect to the latest version (#40) * Update Cartera * Lint * Add comments * MOB-285: Call startTrade() after setMarket() (#43) * Update the v4-native-client.js to replace # with ___ (#42) * Add script * Update v4-client.js * Safer replacement * Safer replacement * Move startWorkers back to Activity.onCreate() (#44) * Move startWorkers back to Activity.start() * Comment * MOB-410 Add tracking for onboarding, transfer, wallet connection (#46) * Adding Onboarding/Transfer/Wallet events * Add userID and userProperties * Optimiazation * Add link to send logcat messages via email (#45) * 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 (#48) * MOB-432 previous branch was based on a wrong branch * PR * Bump Abacus (#50) * Bump Abacus * Revert * MOB-421 add settings control to turn in-app notifications on/off completely (#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 * Feature/mob 396 position cell with margin type (#51) * MOB-432 previous branch was based on a wrong branch * PR * MOB-396 skeleton for position cell * Better layout for place holder views (when there is no position, fill or transfers) * Convert AbacusState flows into StateFlows. (#52) * MOB-422 Withdrawal gating (#53) * Withdrawal Gating * Clean up * Doing the paddings better. (#56) * Update Android Gradle Plugin (#55) * MOB-446 create new add price triggers panel screen (#58) * SL/TP Routing and price triggers panel screen * Update deeplink to match iOS * Renaming * MOB-443 add limit price to price triggers screen (#60) * Feature/mob 356 trade input (#57) * Margin type and leverage screens skeleton * MOB-356 MOB-358 Margin mode screen * Change bg color * move modifier to param * Feature/mob 257 weekly dates (#61) * Added end time to rewards date range * lint * Update SharingStarted usages from Lazily to WhileSubscribed(). (#62) * Fix issue of text input losing calculated value when not focused (#64) * Inject coroutine scopes and dispatchers instead of hardcoding. (#65) * Revert "Update SharingStarted usages from Lazily to WhileSubscribed(). (#62)" (#66) This reverts commit de98092. * Fix margin issues with portfolio position items (#67) * Fix threading issue (#68) * Bump Abacus and v4-client (#69) * MOB-440 TP/SL order submission and data binding (#63) * Wire up input data * Submission * WIP * Bump Abacus and toggle size section * Update PlatformInfoScaffold * submissionStatus = _submissionStatus * Simplify TriggerOrderStream * Fix an issue of order/fill status display (#72) * Fix dollar() formatting crash in FR locale. (#74) * Add formatting functions for size specified in double (1000.0, 0.001,… (#73) * Add formatting functions for size specified in double (1000.0, 0.001, etc) * Clean up * Clean up * Clean up BigDecimals * Remove rounded(bigDecimal: * Fix rounding issue on leverage slider when locale is French (#75) * MOB-441 add TP/SL display to market screen (Android) (#71) * Wire up input data * Submission * WIP * Bump Abacus and toggle size section * MarketInfo buttons * Clean up * Clean up TriggerOrderStream * MOB-442 Support error states for TP/SL inputs (#77) * 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 * Made localizer a computed property (#78) * MOB-455 Add retry to trade and close order submission (#76) * Add retry to trade and close order submission. * _submissionStatus.asStateFlow() * Turn on Kotlin incremental classpath snapshots. (#80) * Fixing threading issues (#79) * Fixing threading issues. * Clean up * Feature/mob 360 target leverage (#59) * 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 * Fix market info's stats/about tab animation issue (#83) * MOB-14 Disable sparkline touching on market list (#84) * Disable sparkline touching on market list * Clean up * Bump version (#81) * Bump Abacus and add script to use locally built Abacus (#86) * Bump Abacus and add script to use locally built Abacus * Usage * Update * Feature/mob 400 adjust margin screen (#85) * 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-466 Integrate Abacus changes for trigger order status notification (#89) * MOB-466 Integrate Abacus changes for trigger order status notification * Clean up PlatformInfoScaffold * Update FF logic to SL/TP trigger (#91) * MOB-445 Add TP | SL button to market info page when there are open positions for the market (#82) * MOB-469: Add basic order lines to market chart (#90) * MOB-469: Add basic order lines to market chart * Only display open orders. * MOB-468: Clean up market prices chart (#92) * Clean up SL/TP (#93) * Clean up SL/TP * Cleanup * MOB-470 MOB-471 Add order line annotations. (#94) * Add Portfolio header selector (#95) * Features/mob 400 adjust margin screen bottom (#87) * 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 * Update abacus to 1.7.6 (#97) * MOB-480 MOB-484: Order-lines formatting, localization, rendering clean-up. (#96) * Update Abacus (#98) * Bump v4-client and AGP (#101) * MOB-495: Add entry and liquidation lines. (#99) * Feature/mob 497 integration margin type (#102) * Set margin type into tradeInput * Layout changes * Update Abacus * Fine tuning Isolated margin trade input * Margin dialog fine tuning * MOB-487 Android: Log error into Crashlytics (#100) * WIP * Timber * Use Logging with consistency * Cleanup * Clean up * Clean up * Lint * Feature/mob 498 integration target leverage (#103) * UX working * Sync up text formatting * Update Abacus * compile issue * Feature/fix trigger (#104) * Turn on V2 abacus manager in debug. (#106) * Bump Cartera and add log message (#108) * Reduct params of v4-client calls from logs (#107) * Stop app from exiting at region restriction (#110) * Stop app from exiting at region restriction * Not showing the button * Lint * MOB-511 Fix JS runner in webview of older devices (#109) * Fix deployment issues with mainnet test users (#111) * 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 * Fix build --------- Co-authored-by: prashanDYDX <163016611+prashanDYDX@users.noreply.github.com> Co-authored-by: Prashan Dharmasena <prashan@dydx.exchange> Co-authored-by: John Huang <johnqh@yahoo.com>
ruixhuang
added a commit
that referenced
this pull request
May 23, 2024
* Update .gitignore to ignore all .idea files and all build directories. (#20) * Turn on Gradle parallel execution and caching. * Add "app_deployment" key (#21) * Add "app_deployment" key * Lint * Initial setup of StrictMode - only logging in debug. (#22) * Initial setup of StrictMode - only logging in debug. * Revert injection changes * Use limitedParallelism and MainScope() in AbacusThreadingImp. (#25) * Handle exception with invalid URLs (#26) * MOB-348 Show Squid routing error on deposit/withdrawal (#28) * Update AppModule.kt and used dependencies to follow Dagger Best Practices guide (in Notion). (#27) * Correlate x-request-id to correlate route requests from Squid transactions (#23) * Fix build (#29) * MOB-362: Some url links don't work with the deployment build (#31) * Test * Check for deeplink path during routing * Clean up * Clean up * Update rest of Dagger modules to follow best practices. (#30) * Remove network selector from settings for release build (#33) * MOB-363: Android: "System" theme setting not working (#32) * Observe system theme * Recompose when theme changes * Fix a crash on url tapping (#34) * Remove hardcoded scheme in the setting links. (#35) * Add Firebase Performance monitoring. (#37) * Bump Abacus and update the system link. (#36) * Fix the release build issue of wallet amount not showing up on deposit (#38) * Fix Subaccount transfer for France (#39) * Fix Subaccount transfer for France * Lint * Update function name to be consistent with iOS * Clean up the start-up sequence (#41) * Clean up the start-up sequence * Lint * Update Cartera and WalletConnnect to the latest version (#40) * Update Cartera * Lint * Add comments * MOB-285: Call startTrade() after setMarket() (#43) * Update the v4-native-client.js to replace # with ___ (#42) * Add script * Update v4-client.js * Safer replacement * Safer replacement * Move startWorkers back to Activity.onCreate() (#44) * Move startWorkers back to Activity.start() * Comment * MOB-410 Add tracking for onboarding, transfer, wallet connection (#46) * Adding Onboarding/Transfer/Wallet events * Add userID and userProperties * Optimiazation * Add link to send logcat messages via email (#45) * 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 (#48) * MOB-432 previous branch was based on a wrong branch * PR * Bump Abacus (#50) * Bump Abacus * Revert * MOB-421 add settings control to turn in-app notifications on/off completely (#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 * Feature/mob 396 position cell with margin type (#51) * MOB-432 previous branch was based on a wrong branch * PR * MOB-396 skeleton for position cell * Better layout for place holder views (when there is no position, fill or transfers) * Convert AbacusState flows into StateFlows. (#52) * MOB-422 Withdrawal gating (#53) * Withdrawal Gating * Clean up * Doing the paddings better. (#56) * Update Android Gradle Plugin (#55) * MOB-446 create new add price triggers panel screen (#58) * SL/TP Routing and price triggers panel screen * Update deeplink to match iOS * Renaming * MOB-443 add limit price to price triggers screen (#60) * Feature/mob 356 trade input (#57) * Margin type and leverage screens skeleton * MOB-356 MOB-358 Margin mode screen * Change bg color * move modifier to param * Feature/mob 257 weekly dates (#61) * Added end time to rewards date range * lint * Update SharingStarted usages from Lazily to WhileSubscribed(). (#62) * Fix issue of text input losing calculated value when not focused (#64) * Inject coroutine scopes and dispatchers instead of hardcoding. (#65) * Revert "Update SharingStarted usages from Lazily to WhileSubscribed(). (#62)" (#66) This reverts commit de98092. * Fix margin issues with portfolio position items (#67) * Fix threading issue (#68) * Bump Abacus and v4-client (#69) * MOB-440 TP/SL order submission and data binding (#63) * Wire up input data * Submission * WIP * Bump Abacus and toggle size section * Update PlatformInfoScaffold * submissionStatus = _submissionStatus * Simplify TriggerOrderStream * Fix an issue of order/fill status display (#72) * Fix dollar() formatting crash in FR locale. (#74) * Add formatting functions for size specified in double (1000.0, 0.001,… (#73) * Add formatting functions for size specified in double (1000.0, 0.001, etc) * Clean up * Clean up * Clean up BigDecimals * Remove rounded(bigDecimal: * Fix rounding issue on leverage slider when locale is French (#75) * MOB-441 add TP/SL display to market screen (Android) (#71) * Wire up input data * Submission * WIP * Bump Abacus and toggle size section * MarketInfo buttons * Clean up * Clean up TriggerOrderStream * MOB-442 Support error states for TP/SL inputs (#77) * 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 * Made localizer a computed property (#78) * MOB-455 Add retry to trade and close order submission (#76) * Add retry to trade and close order submission. * _submissionStatus.asStateFlow() * Turn on Kotlin incremental classpath snapshots. (#80) * Fixing threading issues (#79) * Fixing threading issues. * Clean up * Feature/mob 360 target leverage (#59) * 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 * Fix market info's stats/about tab animation issue (#83) * MOB-14 Disable sparkline touching on market list (#84) * Disable sparkline touching on market list * Clean up * Bump version (#81) * Bump Abacus and add script to use locally built Abacus (#86) * Bump Abacus and add script to use locally built Abacus * Usage * Update * Feature/mob 400 adjust margin screen (#85) * 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-466 Integrate Abacus changes for trigger order status notification (#89) * MOB-466 Integrate Abacus changes for trigger order status notification * Clean up PlatformInfoScaffold * Update FF logic to SL/TP trigger (#91) * MOB-445 Add TP | SL button to market info page when there are open positions for the market (#82) * MOB-469: Add basic order lines to market chart (#90) * MOB-469: Add basic order lines to market chart * Only display open orders. * MOB-468: Clean up market prices chart (#92) * Clean up SL/TP (#93) * Clean up SL/TP * Cleanup * MOB-470 MOB-471 Add order line annotations. (#94) * Add Portfolio header selector (#95) * Features/mob 400 adjust margin screen bottom (#87) * 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 * Update abacus to 1.7.6 (#97) * MOB-480 MOB-484: Order-lines formatting, localization, rendering clean-up. (#96) * Update Abacus (#98) * Bump v4-client and AGP (#101) * MOB-495: Add entry and liquidation lines. (#99) * Feature/mob 497 integration margin type (#102) * Set margin type into tradeInput * Layout changes * Update Abacus * Fine tuning Isolated margin trade input * Margin dialog fine tuning * MOB-487 Android: Log error into Crashlytics (#100) * WIP * Timber * Use Logging with consistency * Cleanup * Clean up * Clean up * Lint * Feature/mob 498 integration target leverage (#103) * UX working * Sync up text formatting * Update Abacus * compile issue * Feature/fix trigger (#104) * Turn on V2 abacus manager in debug. (#106) * Bump Cartera and add log message (#108) * Reduct params of v4-client calls from logs (#107) * Stop app from exiting at region restriction (#110) * Stop app from exiting at region restriction * Not showing the button * Lint * MOB-511 Fix JS runner in webview of older devices (#109) * Fix deployment issues with mainnet test users (#111) * 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 * MOB-513 Clean up force update logic (#113) * MOB-516 Add NavigatePage event (#114) * Bump app version to 1.0.3 (#115) --------- Co-authored-by: prashanDYDX <163016611+prashanDYDX@users.noreply.github.com> Co-authored-by: Prashan Dharmasena <prashan@dydx.exchange> Co-authored-by: John Huang <johnqh@yahoo.com>
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.
Integrate trade input margin mode selector with trade input function from Abacus. Also some UI fixes on both the Trade Input screen and Margin mode screen