From 203fad511e855ed2f59fc8307f3ac45784bea20d Mon Sep 17 00:00:00 2001 From: fbwoolf Date: Thu, 31 Aug 2023 16:43:19 -0500 Subject: [PATCH] refactor: update to leather url paths --- README.md | 2 +- src/app/components/header.tsx | 12 ++++++------ .../{hiro-wallet-logo.tsx => leather-logo.tsx} | 4 ++-- .../leather-intro-dialog/leather-intro-dialog.tsx | 2 +- .../connect-device/connect-ledger-error.layout.tsx | 2 +- .../features/settings-dropdown/settings-dropdown.tsx | 4 +--- .../components/send-btc-disabled.tsx | 4 ++-- .../form/brc-20/brc20-send-form.tsx | 2 +- .../pages/send/sent-summary/brc20-sent-symmary.tsx | 2 +- src/background/messaging/rpc-message-handler.ts | 2 +- .../messaging/rpc-methods/supported-methods.ts | 10 +++++----- .../integration/onboarding/onboarding.spec.ts | 4 ++-- tests-legacy/page-objects/wallet.page.ts | 6 +++--- tests/selectors/onboarding.selectors.ts | 2 +- .../message-signing/bip322-message-signing.spec.ts | 2 +- tests/specs/settings/settings-menu.spec.ts | 2 +- 16 files changed, 30 insertions(+), 32 deletions(-) rename src/app/components/{hiro-wallet-logo.tsx => leather-logo.tsx} (81%) diff --git a/README.md b/README.md index 7d4d7b88f09..15a224303e9 100755 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Leather is the most popular and trusted wallet for apps built on Bitcoin. Connec To integrate this wallet into your app, we recommend [@stacks/connect](https://github.com/hirosystems/connect). -[📚 See Leather Developer Documentation →](https://hirowallet.gitbook.io/developers) +[📚 See Leather Developer Documentation →](https://leather.gitbook.io/developers/home/welcome) [📩 Join the mailing list for updates →](https://forms.gle/sdZPu2jbX1AeQ8Fi9) diff --git a/src/app/components/header.tsx b/src/app/components/header.tsx index bd474fd1a8f..f57690615d5 100644 --- a/src/app/components/header.tsx +++ b/src/app/components/header.tsx @@ -11,7 +11,7 @@ import { BRANCH_NAME, COMMIT_SHA } from '@shared/environment'; import { RouteUrls } from '@shared/route-urls'; import { useDrawers } from '@app/common/hooks/use-drawers'; -import { HiroWalletLogo } from '@app/components/hiro-wallet-logo'; +import { LeatherLogo } from '@app/components/leather-logo'; import { NetworkModeBadge } from '@app/components/network-mode-badge'; import { Title } from '@app/components/typography'; @@ -33,7 +33,7 @@ export const Header: React.FC = memo(props => { const [desktopViewport] = useMediaQuery(`(min-width: ${token('sizes.desktopViewportMinWidth')})`); const [isNarrowViewport] = useMediaQuery('(max-width: 640px)'); - const hiroWalletLogoIsClickable = useMemo(() => { + const leatherLogoIsClickable = useMemo(() => { return ( pathname !== RouteUrls.RequestDiagnostics && pathname !== RouteUrls.Onboarding && @@ -79,10 +79,10 @@ export const Header: React.FC = memo(props => { justifyContent={onClose ? 'center' : 'unset'} > - navigate(RouteUrls.Home) : undefined} + navigate(RouteUrls.Home) : undefined} /> { +export const LeatherLogo = memo((props: LeatherLogoProps) => { const { isClickable, ...rest } = props; return ( diff --git a/src/app/features/leather-intro-dialog/leather-intro-dialog.tsx b/src/app/features/leather-intro-dialog/leather-intro-dialog.tsx index ac65f1b4e6d..83e7b8651b0 100644 --- a/src/app/features/leather-intro-dialog/leather-intro-dialog.tsx +++ b/src/app/features/leather-intro-dialog/leather-intro-dialog.tsx @@ -57,7 +57,7 @@ function LeatherIntroDialogContainer() { function onRejectAndUninstall() { void analytics.track('new_brand_reject_terms'); - openInNewTab('https://hirowallet.gitbook.io/guides/troubleshooting/uninstalling-the-wallet'); + openInNewTab('https://leather.gitbook.io/guides/troubleshooting/uninstall-wallet'); } return ( diff --git a/src/app/features/ledger/generic-steps/connect-device/connect-ledger-error.layout.tsx b/src/app/features/ledger/generic-steps/connect-device/connect-ledger-error.layout.tsx index bc7f04c8dea..4d113a866e0 100644 --- a/src/app/features/ledger/generic-steps/connect-device/connect-ledger-error.layout.tsx +++ b/src/app/features/ledger/generic-steps/connect-device/connect-ledger-error.layout.tsx @@ -77,7 +77,7 @@ export function ConnectLedgerErrorLayout(props: ConnectLedgerErrorLayoutProps) { fontSize={1} onClick={() => openInNewTab( - 'https://hirowallet.gitbook.io/guides/securing-the-wallet/using-ledger-with-hiro' + 'https://leather.gitbook.io/guides/securing-the-wallet/using-ledger-with-leather' ) } > diff --git a/src/app/features/settings-dropdown/settings-dropdown.tsx b/src/app/features/settings-dropdown/settings-dropdown.tsx index e4d39ec29fe..d69ae91336b 100644 --- a/src/app/features/settings-dropdown/settings-dropdown.tsx +++ b/src/app/features/settings-dropdown/settings-dropdown.tsx @@ -105,9 +105,7 @@ export function SettingsDropdown() { data-testid={SettingsMenuSelectors.GetSupportMenuItem} onClick={wrappedCloseCallback(() => { void analytics.track('click_get_support_menu_item'); - openInNewTab( - 'https://wallet.hiro.so/wallet-faq/where-can-i-find-support-for-the-stacks-wallet' - ); + openInNewTab('https://leather.gitbook.io/guides/installing/contact-support'); })} > diff --git a/src/app/pages/send/choose-crypto-asset/components/send-btc-disabled.tsx b/src/app/pages/send/choose-crypto-asset/components/send-btc-disabled.tsx index 569d28dbd5a..3dca6e99c59 100644 --- a/src/app/pages/send/choose-crypto-asset/components/send-btc-disabled.tsx +++ b/src/app/pages/send/choose-crypto-asset/components/send-btc-disabled.tsx @@ -12,8 +12,8 @@ const body = 'Sending bitcoin is temporarily disabled'; const helpTextList = [ - Learm more on Twitter at @hirowallet - openInNewTab('https://mobile.twitter.com/hirowallet')}> + Learm more on Twitter at @LeatherBTC + openInNewTab('https://twitter.com/leatherbtc')}> diff --git a/src/app/pages/send/send-crypto-asset-form/form/brc-20/brc20-send-form.tsx b/src/app/pages/send/send-crypto-asset-form/form/brc-20/brc20-send-form.tsx index 51dff3f91db..5e3d656e4b1 100644 --- a/src/app/pages/send/send-crypto-asset-form/form/brc-20/brc20-send-form.tsx +++ b/src/app/pages/send/send-crypto-asset-form/form/brc-20/brc20-send-form.tsx @@ -73,7 +73,7 @@ export function Brc20SendForm() { lineHeight="1.6" onClick={() => { openInNewTab( - 'https://hirowallet.gitbook.io/guides/bitcoin/sending-brc-20-tokens' + 'https://leather.gitbook.io/guides/bitcoin/sending-brc-20-tokens' ); }} > diff --git a/src/app/pages/send/sent-summary/brc20-sent-symmary.tsx b/src/app/pages/send/sent-summary/brc20-sent-symmary.tsx index 029caed8fcf..9581e32032d 100644 --- a/src/app/pages/send/sent-summary/brc20-sent-symmary.tsx +++ b/src/app/pages/send/sent-summary/brc20-sent-symmary.tsx @@ -65,7 +65,7 @@ export function Brc20SentSummary() { fontWeight={500} lineHeight="1.6" onClick={() => { - openInNewTab('https://hirowallet.gitbook.io/guides/bitcoin/sending-brc-20-tokens'); + openInNewTab('https://leather.gitbook.io/guides/bitcoin/sending-brc-20-tokens'); }} > {'Learn more'} diff --git a/src/background/messaging/rpc-message-handler.ts b/src/background/messaging/rpc-message-handler.ts index 28e0221eb06..bddeb907c35 100644 --- a/src/background/messaging/rpc-message-handler.ts +++ b/src/background/messaging/rpc-message-handler.ts @@ -49,7 +49,7 @@ export async function rpcMessageHandler(message: WalletRequests, port: chrome.ru id: message.id, error: { code: RpcErrorCode.METHOD_NOT_FOUND, - message: `"${message.method}" is not supported. Try running \`.request('supportedMethods')\` to see what Leather can do, or check out our developer documentation at https://hirowallet.gitbook.io/developers`, + message: `"${message.method}" is not supported. Try running \`.request('supportedMethods')\` to see what Leather can do, or check out our developer documentation at https://leather.gitbook.io/developers/home/welcome`, }, }) ); diff --git a/src/background/messaging/rpc-methods/supported-methods.ts b/src/background/messaging/rpc-methods/supported-methods.ts index 6ad9d578f16..52f3ff57bf0 100644 --- a/src/background/messaging/rpc-methods/supported-methods.ts +++ b/src/background/messaging/rpc-methods/supported-methods.ts @@ -10,28 +10,28 @@ export function rpcSupportedMethods(message: SupportedMethodsRequest, port: chro makeRpcSuccessResponse('supportedMethods', { id: message.id, result: { - documentation: 'https://hirowallet.gitbook.io/developers', + documentation: 'https://leather.gitbook.io/developers/home/welcome', methods: [ { name: 'getAddresses', docsUrl: [ - 'https://hirowallet.gitbook.io/developers/bitcoin/connect-users/get-addresses', + 'https://leather.gitbook.io/developers/bitcoin/connect-users/get-addresses', 'https://btckit.org/docs/requests/getaddresses', ], }, { name: 'signMessage', - docsUrl: 'https://hirowallet.gitbook.io/developers/bitcoin/sign-messages', + docsUrl: 'https://leather.gitbook.io/developers/bitcoin/sign-messages', }, { name: 'sendTransfer', docsUrl: - 'https://hirowallet.gitbook.io/developers/bitcoin/sign-transactions/sending-bitcoin', + 'https://leather.gitbook.io/developers/bitcoin/sign-transactions/sending-bitcoin', }, { name: 'signPsbt', docsUrl: - 'https://hirowallet.gitbook.io/developers/bitcoin/sign-transactions/partially-signed-bitcoin-transactions-psbts', + 'https://leather.gitbook.io/developers/bitcoin/sign-transactions/partially-signed-bitcoin-transactions-psbts', }, ], }, diff --git a/tests-legacy/integration/onboarding/onboarding.spec.ts b/tests-legacy/integration/onboarding/onboarding.spec.ts index 1dd2d516876..3c69df2f15b 100644 --- a/tests-legacy/integration/onboarding/onboarding.spec.ts +++ b/tests-legacy/integration/onboarding/onboarding.spec.ts @@ -66,8 +66,8 @@ describe(`Onboarding integration tests`, () => { await wallet.waitForHomePage(); await wallet.clickSettingsButton(); await wallet.page.click(createTestSelector(SettingsSelectors.LockListItem)); - await wallet.waitForHiroWalletLogo(); - await wallet.page.click(wallet.$hiroWalletLogo); + await wallet.waitForLeatherLogo(); + await wallet.page.click(wallet.$leatherLogo); await wallet.waitForEnterPasswordInput(); }); diff --git a/tests-legacy/page-objects/wallet.page.ts b/tests-legacy/page-objects/wallet.page.ts index 34791db28ef..f7a439442fe 100644 --- a/tests-legacy/page-objects/wallet.page.ts +++ b/tests-legacy/page-objects/wallet.page.ts @@ -41,7 +41,7 @@ export class WalletPage { $settingsViewSecretKey = createTestSelector(SettingsSelectors.ViewSecretKeyListItem); $homePageBalancesList = createTestSelector(HomePageSelectorsLegacy.BalancesList); $statusMessage = createTestSelector(WalletPageSelectors.StatusMessage); - $hiroWalletLogo = createTestSelector(OnboardingSelectors.HiroWalletLogoRouteToHome); + $leatherLogo = createTestSelector(OnboardingSelectors.LeatherLogoRouteToHome); $signOutConfirmHasBackupCheckbox = createTestSelector( SettingsSelectors.SignOutConfirmHasBackupCheckbox ); @@ -114,8 +114,8 @@ export class WalletPage { await this.page.waitForSelector(this.$enterPasswordInput, { timeout: 30000 }); } - async waitForHiroWalletLogo() { - await this.page.waitForSelector(this.$hiroWalletLogo, { timeout: 3000 }); + async waitForLeatherLogo() { + await this.page.waitForSelector(this.$leatherLogo, { timeout: 3000 }); } async waitForWelcomePage() { diff --git a/tests/selectors/onboarding.selectors.ts b/tests/selectors/onboarding.selectors.ts index 8e0ac6621f5..b60e6289659 100644 --- a/tests/selectors/onboarding.selectors.ts +++ b/tests/selectors/onboarding.selectors.ts @@ -2,7 +2,7 @@ export enum OnboardingSelectors { AllowAnalyticsBtn = 'allow-analytics-btn', BackUpSecretKeyBtn = 'back-up-secret-key-btn', DenyAnalyticsBtn = 'deny-analytics-btn', - HiroWalletLogoRouteToHome = 'hiro-wallet-logo-route-to-home', + LeatherLogoRouteToHome = 'leather-logo-route-to-home', NewPasswordInput = 'set-or-enter-password-input', NoAssetsFundAccountLink = 'no-assets-fund-account-link', SecretKey = 'secret-key', diff --git a/tests/specs/message-signing/bip322-message-signing.spec.ts b/tests/specs/message-signing/bip322-message-signing.spec.ts index 3d0834daac5..970e14405fb 100644 --- a/tests/specs/message-signing/bip322-message-signing.spec.ts +++ b/tests/specs/message-signing/bip322-message-signing.spec.ts @@ -7,7 +7,7 @@ test.describe('Message signing', () => test.beforeEach(async ({ extensionId, globalPage, onboardingPage, page }) => { await globalPage.setupAndUseApiCalls(extensionId); await onboardingPage.signInWithTestAccount(extensionId); - await page.goto('https://wallet.hiro.so'); + await page.goto('https://leather.io'); }); function clickActionButton(context: BrowserContext) { diff --git a/tests/specs/settings/settings-menu.spec.ts b/tests/specs/settings/settings-menu.spec.ts index f02074ad6a2..0ae26b7b6ca 100644 --- a/tests/specs/settings/settings-menu.spec.ts +++ b/tests/specs/settings/settings-menu.spec.ts @@ -18,6 +18,6 @@ test.describe('settings menu', () => { await test .expect(supportPage) - .toHaveURL('https://hirowallet.gitbook.io/guides/installing/contact-support'); + .toHaveURL('https://leather.gitbook.io/guides/installing/contact-support'); }); });