Merge to main #112
Merged
Merge to main #112
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
* Add "app_deployment" key * Lint
* Initial setup of StrictMode - only logging in debug. * Revert injection changes
…ices guide (in Notion). (#27)
* 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
* Update Cartera * Lint * Add comments
* 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
* 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"
#89) * MOB-466 Integrate Abacus changes for trigger order status notification * Clean up PlatformInfoScaffold
…sitions for the market (#82)
* 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: # build.gradle # gradle.properties # gradle/wrapper/gradle-wrapper.properties # v4/app/build.gradle # v4/app/src/main/java/exchange/dydx/trading/AppModule.kt # v4/build.gradle # v4/core/src/main/java/exchange/dydx/trading/TradingActivity.kt # v4/core/src/main/java/exchange/dydx/trading/core/CoreViewModel.kt # v4/core/src/main/java/exchange/dydx/trading/core/DydxRouterImpl.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/market/src/main/java/exchange/dydx/trading/feature/market/marketinfo/components/position/DydxMarketPositionViewModel.kt # v4/feature/onboarding/src/main/java/exchange/dydx/feature/onboarding/connect/DydxOnboardConnectView.kt # v4/feature/onboarding/src/main/java/exchange/dydx/feature/onboarding/desktopscan/DydxDesktopScanView.kt # v4/feature/onboarding/src/main/java/exchange/dydx/feature/onboarding/desktopscan/DydxDesktopScanViewModel.kt # v4/feature/portfolio/src/main/java/exchange/dydx/trading/feature/portfolio/components/fills/DydxPortfolioFillsView.kt # v4/feature/portfolio/src/main/java/exchange/dydx/trading/feature/portfolio/components/orders/DydxPortfolioOrdersView.kt # v4/feature/portfolio/src/main/java/exchange/dydx/trading/feature/portfolio/components/positions/DydxPortfolioPositionItemView.kt # v4/feature/portfolio/src/main/java/exchange/dydx/trading/feature/portfolio/components/positions/DydxPortfolioPositionsView.kt # v4/feature/portfolio/src/main/java/exchange/dydx/trading/feature/portfolio/orderdetails/DydxOrderDetailsView.kt # v4/feature/profile/src/main/java/exchange/dydx/trading/feature/profile/keyexport/DydxKeyExportView.kt # v4/feature/profile/src/main/java/exchange/dydx/trading/feature/profile/reportissue/DydxReportIssueViewModel.kt # v4/feature/shared/src/main/java/exchange/dydx/trading/feature/shared/analytics/OnboardingAnalytics.kt # v4/feature/shared/src/main/java/exchange/dydx/trading/feature/shared/analytics/TransferAnalytics.kt # v4/feature/shared/src/main/java/exchange/dydx/trading/feature/shared/analytics/WalletAnalytics.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/margin/DydxAdjustMarginInputView.kt # v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/margin/DydxAdjustMarginInputViewModel.kt # v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/streams/TriggerOrderStream.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/tradeinput/DydxTradeInputView.kt # v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/tradeinput/DydxTradeInputViewModel.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/DydxTriggerOrderCtaButtonViewModel.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/size/DydxTriggerOrderSizeViewModel.kt # v4/feature/transfer/src/main/java/exchange/dydx/trading/feature/transfer/DydxTransferView.kt # v4/feature/transfer/src/main/java/exchange/dydx/trading/feature/transfer/deposit/DydxTransferDepositViewModel.kt # v4/feature/transfer/src/main/java/exchange/dydx/trading/feature/transfer/faucet/DydxTransferFaucetView.kt # v4/feature/transfer/src/main/java/exchange/dydx/trading/feature/transfer/status/DydxTransferStatusView.kt # v4/feature/workers/src/main/java/exchange/dydx/trading/feature/workers/DydxGlobalWorkers.kt # v4/feature/workers/src/main/java/exchange/dydx/trading/feature/workers/globalworkers/DydxUserTrackingWorker.kt # v4/integration/analytics/src/main/java/exchange/dydx/trading/integration/analytics/AmplitudeTracker.kt # v4/integration/analytics/src/main/java/exchange/dydx/trading/integration/analytics/CompositeTracker.kt # v4/integration/cosmos/src/main/assets/v4-native-client.js # v4/integration/cosmos/src/main/java/exchange/dydx/trading/integration/cosmos/CosmosV4Client.kt # v4/integration/cosmos/src/main/java/exchange/dydx/trading/integration/cosmos/CosmosV4ClientWebview.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/AbacusStateTriggerOrder.kt # v4/integration/dydxStateManager/src/main/java/exchange/dydx/dydxstatemanager/protocolImplementations/AbacusFileSystemImp.kt # v4/integration/dydxStateManager/src/main/java/exchange/dydx/dydxstatemanager/protocolImplementations/AbacusRestImp.kt # v4/integration/dydxStateManager/src/main/java/exchange/dydx/dydxstatemanager/protocolImplementations/AbacusTrackingImp.kt # v4/integration/dydxStateManager/src/main/java/exchange/dydx/dydxstatemanager/protocolImplementations/AbacusWebSocketImp.kt # v4/integration/javascript/src/main/java/exchange/dydx/integration/javascript/JavascriptRunnerV4.kt # v4/platformUI/src/main/java/exchange/dydx/platformui/designSystem/theme/ThemeConfig.kt # v4/platformUI/src/main/java/exchange/dydx/platformui/designSystem/theme/ThemeSettingsExt.kt # v4/utilities/src/main/java/exchange/dydx/utilities/utils/CachedFileLoader.kt # v4/utilities/src/main/java/exchange/dydx/utilities/utils/FileUtils.kt # v4/utilities/src/main/java/exchange/dydx/utilities/utils/LogCatReader.kt
johnqh
approved these changes
May 21, 2024
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.