From 96620db703be33d595e01821971f332030466c61 Mon Sep 17 00:00:00 2001 From: David Murdoch <187813+davidmurdoch@users.noreply.github.com> Date: Wed, 12 Feb 2025 16:57:46 -0500 Subject: [PATCH 1/2] refactor: remove circular dependencies in `ui/pages/snap-account-redirect/*` --- development/circular-deps.jsonc | 7 ------- .../components/snap-account-redirect-context.tsx | 2 +- .../components/snap-account-redirect-message.tsx | 2 +- .../snap-account-redirect/components/url-display-box.tsx | 2 +- ui/pages/snap-account-redirect/snap-account-redirect.tsx | 2 +- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/development/circular-deps.jsonc b/development/circular-deps.jsonc index a2f7618b4531..e111ce8af645 100644 --- a/development/circular-deps.jsonc +++ b/development/circular-deps.jsonc @@ -243,13 +243,6 @@ "ui/pages/notifications/notifications-list.tsx", "ui/pages/notifications/notifications.tsx" ], - [ - "ui/pages/snap-account-redirect/components/index.ts", - "ui/pages/snap-account-redirect/components/snap-account-redirect-context.tsx", - "ui/pages/snap-account-redirect/components/snap-account-redirect-message.tsx", - "ui/pages/snap-account-redirect/components/url-display-box.tsx", - "ui/pages/snap-account-redirect/snap-account-redirect.tsx" - ], [ "ui/pages/swaps/swaps.util.ts", "ui/store/actions.ts" diff --git a/ui/pages/snap-account-redirect/components/snap-account-redirect-context.tsx b/ui/pages/snap-account-redirect/components/snap-account-redirect-context.tsx index a58d8b1c66ba..725a8b4e1eaa 100644 --- a/ui/pages/snap-account-redirect/components/snap-account-redirect-context.tsx +++ b/ui/pages/snap-account-redirect/components/snap-account-redirect-context.tsx @@ -8,7 +8,7 @@ import { ButtonVariant, Text, } from '../../../components/component-library'; -import { SnapAccountRedirectProps } from '../snap-account-redirect'; +import { type SnapAccountRedirectProps } from '../snap-account-redirect'; import { AlignItems, Display, diff --git a/ui/pages/snap-account-redirect/components/snap-account-redirect-message.tsx b/ui/pages/snap-account-redirect/components/snap-account-redirect-message.tsx index 29deea175447..32679f2b0054 100644 --- a/ui/pages/snap-account-redirect/components/snap-account-redirect-message.tsx +++ b/ui/pages/snap-account-redirect/components/snap-account-redirect-message.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Display, TextVariant } from '../../../helpers/constants/design-system'; import { Box, Text } from '../../../components/component-library'; -import { SnapAccountRedirectProps } from '../snap-account-redirect'; +import type { SnapAccountRedirectProps } from '../snap-account-redirect'; import { SnapDelineator } from '../../../components/app/snaps/snap-delineator'; import UrlDisplayBox from './url-display-box'; diff --git a/ui/pages/snap-account-redirect/components/url-display-box.tsx b/ui/pages/snap-account-redirect/components/url-display-box.tsx index 34636e2098c4..2bd7c5a2750a 100644 --- a/ui/pages/snap-account-redirect/components/url-display-box.tsx +++ b/ui/pages/snap-account-redirect/components/url-display-box.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { SnapAccountRedirectProps } from '../snap-account-redirect'; +import { type SnapAccountRedirectProps } from '../snap-account-redirect'; import { AlignItems, BackgroundColor, diff --git a/ui/pages/snap-account-redirect/snap-account-redirect.tsx b/ui/pages/snap-account-redirect/snap-account-redirect.tsx index 6081d08a8c31..da52916c0f1b 100644 --- a/ui/pages/snap-account-redirect/snap-account-redirect.tsx +++ b/ui/pages/snap-account-redirect/snap-account-redirect.tsx @@ -8,7 +8,7 @@ import { FlexDirection, } from '../../helpers/constants/design-system'; import SnapAuthorshipHeader from '../../components/app/snaps/snap-authorship-header'; -import { SnapAccountRedirectContent } from './components'; +import SnapAccountRedirectContent from './components/snap-account-redirect-context'; export type SnapAccountRedirectProps = { url: string; From 2c740db56ed8a91f5806248b2b2286bffa607c76 Mon Sep 17 00:00:00 2001 From: David Murdoch <187813+davidmurdoch@users.noreply.github.com> Date: Wed, 19 Feb 2025 11:56:46 -0500 Subject: [PATCH 2/2] move `type` keyword over --- .../components/snap-account-redirect-context.tsx | 2 +- ui/pages/snap-account-redirect/components/url-display-box.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/pages/snap-account-redirect/components/snap-account-redirect-context.tsx b/ui/pages/snap-account-redirect/components/snap-account-redirect-context.tsx index 725a8b4e1eaa..d599d062e960 100644 --- a/ui/pages/snap-account-redirect/components/snap-account-redirect-context.tsx +++ b/ui/pages/snap-account-redirect/components/snap-account-redirect-context.tsx @@ -8,7 +8,7 @@ import { ButtonVariant, Text, } from '../../../components/component-library'; -import { type SnapAccountRedirectProps } from '../snap-account-redirect'; +import type { SnapAccountRedirectProps } from '../snap-account-redirect'; import { AlignItems, Display, diff --git a/ui/pages/snap-account-redirect/components/url-display-box.tsx b/ui/pages/snap-account-redirect/components/url-display-box.tsx index 2bd7c5a2750a..a8f92e99de0c 100644 --- a/ui/pages/snap-account-redirect/components/url-display-box.tsx +++ b/ui/pages/snap-account-redirect/components/url-display-box.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { type SnapAccountRedirectProps } from '../snap-account-redirect'; +import type { SnapAccountRedirectProps } from '../snap-account-redirect'; import { AlignItems, BackgroundColor,