From 23f18da2fbf12edd0e7daaaf91cd668dfd1cafd7 Mon Sep 17 00:00:00 2001 From: tomasklim Date: Thu, 22 Sep 2022 12:28:34 +0200 Subject: [PATCH] chore(suite): move tor urls to @trezor/urls package --- packages/suite-desktop/src-electron/config.ts | 2 +- packages/suite-desktop/src-electron/libs/constants.ts | 2 +- packages/suite-web-landing/pages/_document.tsx | 2 +- packages/suite/src/components/suite/ReadMoreLink/index.tsx | 6 +++--- packages/suite/src/constants/suite/index.ts | 3 +-- packages/suite/src/utils/suite/__tests__/tor.test.ts | 2 +- packages/suite/src/utils/suite/tor.ts | 2 +- packages/urls/src/index.ts | 1 + packages/{suite/src/constants/suite => urls/src}/tor.ts | 0 9 files changed, 10 insertions(+), 10 deletions(-) rename packages/{suite/src/constants/suite => urls/src}/tor.ts (100%) diff --git a/packages/suite-desktop/src-electron/config.ts b/packages/suite-desktop/src-electron/config.ts index 9cb394e15b..fc6e31571d 100644 --- a/packages/suite-desktop/src-electron/config.ts +++ b/packages/suite-desktop/src-electron/config.ts @@ -1,4 +1,4 @@ -import { TOR_URLS } from '@suite-constants/tor'; +import { TOR_URLS } from '@trezor/urls'; export const onionDomain = TOR_URLS['trezor.io']; diff --git a/packages/suite-desktop/src-electron/libs/constants.ts b/packages/suite-desktop/src-electron/libs/constants.ts index d33def9507..98daf7ac36 100644 --- a/packages/suite-desktop/src-electron/libs/constants.ts +++ b/packages/suite-desktop/src-electron/libs/constants.ts @@ -1,6 +1,6 @@ import url from 'url'; import { isDev } from '@suite-utils/build'; -import { TOR_URLS } from '@suite-constants/tor'; +import { TOR_URLS } from '@trezor/urls'; export const APP_NAME = 'Trezor Suite'; diff --git a/packages/suite-web-landing/pages/_document.tsx b/packages/suite-web-landing/pages/_document.tsx index 745cd478da..116b5f9f93 100644 --- a/packages/suite-web-landing/pages/_document.tsx +++ b/packages/suite-web-landing/pages/_document.tsx @@ -4,7 +4,7 @@ import { resolveStaticPath } from '@trezor/utils/lib/resolveStaticPath'; import { ServerStyleSheet } from 'styled-components'; import globalStyles from '../support/styles'; import { isFeatureFlagEnabled } from '@suite-common/suite-utils'; -import { TOR_URLS } from '@suite-constants/tor'; +import { TOR_URLS } from '@trezor/urls'; const isOnionLocation = isFeatureFlagEnabled('ONION_LOCATION_META'); diff --git a/packages/suite/src/components/suite/ReadMoreLink/index.tsx b/packages/suite/src/components/suite/ReadMoreLink/index.tsx index 842e7b5422..5ead7c00c9 100644 --- a/packages/suite/src/components/suite/ReadMoreLink/index.tsx +++ b/packages/suite/src/components/suite/ReadMoreLink/index.tsx @@ -3,15 +3,15 @@ import * as URLS from '@trezor/urls'; import { Translation, TrezorLink } from '@suite-components'; import { ExtendedMessageDescriptor } from '@suite-types'; -interface Props { - url: keyof typeof URLS; +interface ReadMoreLinkProps { + url: keyof Omit; linkLabel?: ExtendedMessageDescriptor['id']; message?: ExtendedMessageDescriptor['id']; } // common component used in various places // displays Translation with TR_LEARN_MORE value (Link) or standalone Link -export const ReadMoreLink = ({ url, message, linkLabel }: Props) => +export const ReadMoreLink = ({ url, message, linkLabel }: ReadMoreLinkProps) => message ? ( { diff --git a/packages/suite/src/utils/suite/tor.ts b/packages/suite/src/utils/suite/tor.ts index 16a1d506f0..725d150d8f 100644 --- a/packages/suite/src/utils/suite/tor.ts +++ b/packages/suite/src/utils/suite/tor.ts @@ -1,5 +1,5 @@ import { parseHostname } from '@trezor/utils'; -import { TOR_URLS } from '@suite-constants/tor'; +import { TOR_URLS } from '@trezor/urls'; import { TorStatus } from '@suite-types'; /** diff --git a/packages/urls/src/index.ts b/packages/urls/src/index.ts index efc5aadee8..b5f7576376 100644 --- a/packages/urls/src/index.ts +++ b/packages/urls/src/index.ts @@ -1,2 +1,3 @@ export * from './urls'; export * from './github'; +export * from './tor'; diff --git a/packages/suite/src/constants/suite/tor.ts b/packages/urls/src/tor.ts similarity index 100% rename from packages/suite/src/constants/suite/tor.ts rename to packages/urls/src/tor.ts