Commit f7a244b
committed
Merge remote-tracking branch 'origin/main' into kureev/MUSD-716
# Conflicts:
# app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.test.tsx
# app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.tsx1,186 files changed
Lines changed: 60131 additions & 54145 deletions
File tree
- .agents/skills/e2e-test
- references
- .github
- actions
- ci-status-gate
- setup-e2e-env
- smart-e2e-selection
- guidelines
- rules
- scripts
- workflows
- .yarn/patches
- android/app
- src/main/res/values
- app
- actions
- settings
- user
- component-library
- components-temp
- MainActionButton
- SectionHeader
- Tabs/TabsBar
- components
- Approvals
- AddChainApproval
- ApprovalModal
- ConnectApproval
- FlowLoaderModal
- TemplateConfirmationModal
- WatchAssetApproval
- Base
- AnimatedFox
- RemoteImage
- TokenIcon
- UI
- AccountNetworkIndicator
- ActionModal
- __snapshots__
- ActionView
- AnimatedSpinner
- AnimatedTransactionModal
- AssetIcon
- AssetList
- BasicFunctionality
- BlockingActionModal
- Bridge
- Views/BridgeView
- components
- MissingPriceModal
- PriceImpactModal
- QuoteDetailsCard
- SwapsConfirmButton
- TokenWarningModal
- hooks
- useBridgeConfirm
- useBridgeQuoteData
- useInitialSlippage
- useLatestBalance
- useShouldRenderGasSponsoredBanner
- useSlippageConfig
- useUnifiedSwapBridgeContext
- utils
- Button
- Card
- Views
- CardAuthentication
- CardHome
- Cashback
- components
- CardMessageBox
- Onboarding
- SpendingLimitProgressBar
- hooks
- sdk
- util
- Compliance/contexts
- Confetti
- CustomAlert
- Earn
- Views
- EarnMusdConversionEducationView
- MusdQuickConvertView
- components/MusdBalanceCard
- components
- EarnDepositTokenListItem
- EarnLendingBalance
- Earnings/EarningsHistory/EarningsTimePeriod
- Musd
- MusdConversionAssetListCta
- MusdConversionAssetOverviewCta
- MusdConversionAssetRow
- constants/events
- hooks
- routes
- selectors/featureFlags
- types
- FadeOutOverlay
- FadeView
- FoxScreen
- GenericButton
- __snapshots__
- GlobalAlert
- HintModal
- __snapshots__
- ImageIcon
- LoginOptionsSwitch
- __snapshots__
- Money
- Views
- MoneyActivityView
- MoneyHomeView
- MoneyHowItWorksView
- MoneyPotentialEarningsView
- components
- MoneyAccountHomeRow
- MoneyApyInfoSheet
- MoneyCondensedInfoCards
- MoneyConvertStablecoins
- MoneyEarningsInfoSheet
- MoneyEarnings
- MoneyMetaMaskCard
- MoneyMoreSheet
- MoneyOnboardingCard
- MoneyPotentialEarnings
- MoneySectionHeader
- MoneyTransferSheet
- hooks
- routes
- utils
- NetworkMainAssetLogo
- OnboardingScreenWithBg
- Perps
- Debug
- Views
- PerpsAdjustMarginView
- PerpsCancelAllOrdersView
- PerpsCloseAllPositionsView
- PerpsHomeView
- PerpsMarketDetailsView
- PerpsOrderView
- PerpsPositionsView
- PerpsTabView
- PerpsTransactionsView
- PerpsWithdrawView
- __mocks__
- components
- PerpsBottomSheetTooltip
- PerpsCard
- PerpsEmptyBalance
- PerpsHomeHeader
- PerpsHomeSection
- PerpsLeverageBottomSheet
- PerpsLimitPriceBottomSheet
- PerpsMarketBalanceActions
- PerpsMarketTypeSection
- PerpsProgressBar
- PerpsProviderSelector
- PerpsRecentActivityList
- PerpsSlider
- PerpsTabControlBar
- PerpsWatchlistMarkets
- TradingViewChart
- hooks
- stream
- providers
- selectors/perpsController
- services
- utils
- Predict
- components
- FeaturedCarousel
- PredictHome
- PredictSportLineSelector
- PredictSportOutcomeCard
- PredictSportScoreboard
- constants
- contexts
- controllers
- hooks
- providers/polymarket
- types
- utils
- views
- PredictAddFundsModal
- PredictBuyPreview
- PredictBuyWithAnyToken
- components
- PredictBuyActionButton
- PredictPayWithAnyTokenInfo
- PredictPayWithRow
- PredictQuickAmounts
- hooks
- PredictFeed
- QRHardware
- Ramp
- Aggregator/Views/OrdersList
- Views
- BuildQuote
- Checkout
- OrderDetails
- headless
- hooks
- Rewards
- Views
- components
- Campaigns
- Onboarding
- __tests__
- hooks
- utils
- SecurityTrust/components/SecurityTrustInlineBadge
- Sites
- components
- SiteRowItemWrapper
- SiteRowItem
- SitesList
- hooks
- useBrowserFavoritesSites
- useBrowserRecentsSites
- useSiteData
- Stake/components/StakeButton
- TokenDetails
- constants
- hooks
- Tokens
- TokenList/TokenListItem
- components/TokenListSecurityBadge
- hooks
- queries
- util
- Trending
- Views/TrendingTokensFullView
- components
- FilterBar
- TrendingListHeader
- TrendingTokenRowItem
- hooks/useTrendingTokenPress
- UrlAutocomplete
- Views
- AccountConnect
- AccountConnectMultiSelector
- __snapshots__
- __snapshots__
- AccountPermissions
- AccountPermissionsConfirmRevokeAll
- __snapshots__
- AccountPermissionsConnected
- ConnectionDetails
- __snapshots__
- NetworkPermissionsConnected
- __snapshots__
- PermittedNetworksInfoSheet
- __snapshots__
- __snapshots__
- AccountStatus
- __snapshots__
- AccountsMenu
- ActivityView
- __snapshots__
- AddAccountActions
- __snapshots__
- AddBookmark
- __snapshots__
- AddressSelector
- __snapshots__
- AesCryptoTestForm
- __snapshots__
- BrowserTab
- __snapshots__
- components
- IpfsBanner
- __snapshots__
- Options
- __snapshots__
- PhishingModal
- __snapshots__
- Browser
- __snapshots__
- CashTokensFullView
- ChangeInSimulationModal
- __snapshots__
- ChoosePassword
- ConnectQRHardware
- __snapshots__
- DataCollectionModal
- __snapshots__
- DiscoveryTab
- __snapshots__
- EnterPasswordSimple
- __snapshots__
- ErrorBoundary
- __snapshots__
- ExperienceEnhancerModal
- __snapshots__
- GasEducationCarousel
- __snapshots__
- Homepage
- Sections
- Cash
- TopTraders
- components
- hooks
- WhatsHappening
- components
- components/HomepageSectionUnrealizedPnlRow
- ImportFromSecretRecoveryPhrase
- ImportPrivateKeySuccess
- __snapshots__
- ImportPrivateKey
- __snapshots__
- InfoNetworkModal
- __snapshots__
- Login
- ManualBackupStep1
- MultiRpcModal
- __snapshots__
- OAuthRehydration
- OfflineMode
- __snapshots__
- OriginSpamModal
- __snapshots__
- PickComponent
- __snapshots__
- ResetPassword
- __snapshots__
- RevealPrivateCredential/components
- Settings
- DeveloperOptions
- GeneralSettings
- ShowDisplayMediaNFTSheet
- __snapshots__
- ShowIpfsGatewaySheet
- __snapshots__
- ShowTokenIdSheet
- __snapshots__
- SimpleWebview
- __snapshots__
- SitesFullView
- SocialLeaderboard
- NotificationPreferencesView
- hooks
- TopTradersView
- TraderPositionView
- components
- QuickBuyBottomSheet
- hooks
- utils
- TraderProfileView
- components
- TraderNotificationsBottomSheet
- hooks
- SuccessErrorSheet
- __snapshots__
- TransactionsView
- __snapshots__
- TrendingView
- Views
- ExploreSearchScreen
- ExploreSectionResultsFullView
- components
- ExploreSearchBar
- ExploreSearchResults
- QuickActions
- SectionHeader
- Sections
- SectionTypes
- feeds
- dapps
- perps
- predictions
- sites
- stocks
- tokens
- hooks
- search
- tabs
- utils
- WalletRecovery
- __snapshots__
- Wallet
- __snapshots__
- confirmations
- components
- AccountSelector
- PayAccountSelector
- activity/transaction-details-summary
- info
- custom-amount-info
- money-account-deposit-info
- money-account-withdraw-info
- musd-max-conversion-info
- perps-withdraw-info
- predict-deposit-info
- predict-withdraw-info
- modals/pay-with-modal
- perps-confirmations/perps-withdraw-balance
- projected-five-year-balance
- rows/pay-with-row
- constants
- hooks
- alerts
- metrics
- pay
- send
- tokens
- transactions
- types
- hooks
- constants
- controllers/perps
- aggregation
- constants
- providers
- services
- types
- utils
- core
- Analytics
- BackgroundBridge
- DeeplinkManager
- handlers/legacy
- __tests__
- types
- util/deeplinks
- Engine
- controllers
- analytics-controller
- assets-controller
- card-controller/providers
- rewards-controller
- services
- transaction-controller
- event-handlers
- messengers
- accounts-controller-messenger
- rewards-controller-messenger
- transaction-controller-messenger
- HardwareWallet
- adapters
- errors
- Ledger
- Multichain/test
- QrKeyring
- SnapKeyring
- redux/slices/bridge
- images
- rewards
- reducers
- rewards
- settings
- user
- selectors
- assets
- bridgeController
- featureFlagController
- assetsUnifyState
- confirmations
- explorePageV2
- exploreSectionsOrder
- haptics
- tokenListSecurityBadges
- multichainAccounts
- multichain
- networkEnablementController
- store/migrations
- util
- address
- bridge/hooks
- haptics
- __mocks__
- testing
- metrics/UserSettingsAnalyticsMetaData
- networks
- number
- sentry/tags
- social
- tempo
- test
- transaction-controller
- docs
- perps
- hyperliquid
- readme
- ios/MetaMask.xcodeproj
- locales/languages
- scripts
- build-announce
- perps/agentic/teams/perps
- flows
- recipes
- tests
- api-mocking
- helpers
- mock-responses
- defaults
- musd
- polymarket
- component-view/renderers
- controller-mocking
- mock-config
- mock-responses/perps
- feature-flags
- framework
- fixtures/json
- fixture
- helpers
- analytics/expectations
- swap
- locators/Trending
- page-objects
- Confirmation
- Onboarding
- Perps
- Trending
- wallet
- performance
- login
- launch-times
- predict
- reporters
- providers/sentry
- scripts
- smoke
- card
- confirmations
- send
- transactions
- 7702
- networks
- predict
- ramps
- stake
- swap
- trending
- wallet
- helpers
- tools/e2e-ai-analyzer
- modes/generate-test-plan
- skills
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
69 | | - | |
| 69 | + | |
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
2 | 134 | | |
3 | 135 | | |
4 | 136 | | |
| |||
42 | 174 | | |
43 | 175 | | |
44 | 176 | | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
45 | 182 | | |
46 | 183 | | |
47 | 184 | | |
| |||
466 | 603 | | |
467 | 604 | | |
468 | 605 | | |
469 | | - | |
470 | | - | |
| 606 | + | |
| 607 | + | |
| 608 | + | |
| 609 | + | |
| 610 | + | |
| 611 | + | |
| 612 | + | |
| 613 | + | |
| 614 | + | |
| 615 | + | |
| 616 | + | |
| 617 | + | |
| 618 | + | |
| 619 | + | |
| 620 | + | |
| 621 | + | |
| 622 | + | |
| 623 | + | |
| 624 | + | |
| 625 | + | |
| 626 | + | |
| 627 | + | |
| 628 | + | |
| 629 | + | |
| 630 | + | |
| 631 | + | |
| 632 | + | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
| 642 | + | |
| 643 | + | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
| 653 | + | |
| 654 | + | |
| 655 | + | |
| 656 | + | |
| 657 | + | |
| 658 | + | |
| 659 | + | |
| 660 | + | |
| 661 | + | |
| 662 | + | |
| 663 | + | |
| 664 | + | |
| 665 | + | |
| 666 | + | |
| 667 | + | |
| 668 | + | |
| 669 | + | |
| 670 | + | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
| 674 | + | |
| 675 | + | |
| 676 | + | |
| 677 | + | |
471 | 678 | | |
472 | 679 | | |
473 | 680 | | |
474 | 681 | | |
| 682 | + | |
| 683 | + | |
| 684 | + | |
| 685 | + | |
| 686 | + | |
| 687 | + | |
| 688 | + | |
475 | 689 | | |
476 | 690 | | |
477 | 691 | | |
478 | 692 | | |
479 | 693 | | |
480 | 694 | | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
| 699 | + | |
481 | 700 | | |
482 | 701 | | |
483 | 702 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
46 | 50 | | |
47 | 51 | | |
48 | 52 | | |
| |||
334 | 338 | | |
335 | 339 | | |
336 | 340 | | |
| 341 | + | |
337 | 342 | | |
338 | 343 | | |
339 | | - | |
| 344 | + | |
340 | 345 | | |
341 | 346 | | |
342 | 347 | | |
| |||
0 commit comments