Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/components/app/wallet-overview/coin-overview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ export const CoinOverview = ({
balance={
shouldShowBalanceEmptyState ? (
<BalanceEmptyState
className="w-full max-w-[420px]"
className="w-full max-w-[460px] self-center"
data-testid="coin-overview-balance-empty-state"
onClickReceive={handleReceiveOnClick}
/>
Expand Down
3 changes: 0 additions & 3 deletions ui/pages/multi-srp/import-srp/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
z-index: 55;
padding: 24px;
padding-top: 0;
max-width: 446px;
min-height: 700px;
height: 700px;

@include design-system.screen-sm-max {
min-height: auto;
Expand Down
7 changes: 0 additions & 7 deletions ui/pages/multichain-accounts/account-list/account-list.scss

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const AddWalletPage = () => {
);

return (
<Page className="max-w-[600px]">
<Page>
<Header
textProps={{
variant: LegacyTextVariant.headingSm,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export const MultichainAccountAddressListPage = ({
}, []);

return (
<Page className="max-w-[600px]">
<Page>
<Header
textProps={{
variant: TextVariant.headingSm,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export const MultichainAccountPrivateKeyListPage = ({
);

return (
<Page className="max-w-[600px]">
<Page>
<Header
textProps={{
variant: TextVariant.headingSm,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const SmartAccountPage = ({
}

return (
<Page className="max-w-[600px]">
<Page>
<Header
textProps={{
variant: TextVariant.headingSm,
Expand Down
1 change: 0 additions & 1 deletion ui/pages/pages.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
@import 'swaps/index';
@import 'bridge/index';
@import 'unlock-page/index';
@import 'multichain-accounts/account-list/account-list';
@import 'multichain-accounts/wallet-details-page/index';
@import 'multi-srp/import-srp/index';
@import 'multichain-accounts/multichain-account-details-page/index';
Expand Down
17 changes: 5 additions & 12 deletions ui/pages/routes/routes.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ import KeyringSnapRemovalResult from '../../components/app/modals/keyring-snap-r
import { MultichainAccountListMenu } from '../../components/multichain-accounts/multichain-account-list-menu';

import { DeprecatedNetworkModal } from '../settings/deprecated-network-modal/DeprecatedNetworkModal';
import { MultichainMetaFoxLogo } from '../../components/multichain/app-header/multichain-meta-fox-logo';
import NetworkConfirmationPopover from '../../components/multichain/network-list-menu/network-confirmation-popover/network-confirmation-popover';
import { ToastMaster } from '../../components/app/toast-master/toast-master';
import { type DynamicImportType, mmLazy } from '../../helpers/utils/mm-lazy';
Expand All @@ -152,11 +151,7 @@ import { State2Wrapper } from '../../components/multichain-accounts/state2-wrapp
import { RootLayout } from '../../layouts/root-layout';
import { LegacyLayout } from '../../layouts/legacy-layout';
import { RouteWithLayout } from '../../layouts/route-with-layout';
import {
getConnectingLabel,
isConfirmTransactionRoute,
setTheme,
} from './utils';
import { getConnectingLabel, setTheme } from './utils';
import { ConfirmationHandler } from './confirmation-handler';
import { Modals } from './modals';

Expand Down Expand Up @@ -705,7 +700,7 @@ export default function Routes() {
authenticated
path={IMPORT_SRP_ROUTE}
component={ImportSrpPage}
layout={LegacyLayout}
layout={RootLayout}
/>
<RouteWithLayout
authenticated
Expand Down Expand Up @@ -765,7 +760,7 @@ export default function Routes() {
</RouteWithLayout>
<RouteWithLayout
path={`${CONFIRM_TRANSACTION_ROUTE}/:id?`}
layout={LegacyLayout}
layout={RootLayout}
>
{createV5CompatRoute<{ id?: string }>(ConfirmTransaction, {
wrapper: AuthenticatedV5Compat,
Expand Down Expand Up @@ -827,7 +822,7 @@ export default function Routes() {
</RouteWithLayout>
<RouteWithLayout
path={`${CONFIRMATION_V_NEXT_ROUTE}/:id?`}
layout={LegacyLayout}
layout={RootLayout}
>
{createV5CompatRoute<{ id?: string }>(ConfirmationPage, {
wrapper: AuthenticatedV5Compat,
Expand Down Expand Up @@ -1190,9 +1185,7 @@ export default function Routes() {
<QRHardwarePopover />
<Modal />
<Alert visible={alertOpen} msg={alertMessage} />
{isConfirmTransactionRoute(location.pathname) && (
<MultichainMetaFoxLogo />
)}

{isAccountMenuOpen ? accountListMenu : null}

<NetworkConfirmationPopover />
Expand Down
Loading