Skip to content
Closed
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 app/manifest/v2/_base.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"author": "https://metamask.io",
"author": "https://metamask.com",
"background": {
"page": "background.html",
"persistent": true
Expand Down
2 changes: 1 addition & 1 deletion app/manifest/v3/_base.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"default_title": "MetaMask",
"default_popup": "popup-init.html"
},
"author": "https://metamask.io",
"author": "https://metamask.com",
"background": {
"service_worker": "service-worker.ts"
},
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/controllers/analytics/analytics.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ describe('analytics', () => {

expect(setUninstallURL).toHaveBeenCalledTimes(1);
expect(setUninstallURL).toHaveBeenCalledWith(
`https://metamask.io/uninstalled?${new URLSearchParams({
`https://metamask.com/uninstalled?${new URLSearchParams({
av: testVersion,
mmi: encodedAnalyticsId,
env: ENVIRONMENT.PRODUCTION,
Expand All @@ -501,7 +501,7 @@ describe('analytics', () => {

expect(setUninstallURL).toHaveBeenCalledTimes(1);
expect(setUninstallURL).toHaveBeenCalledWith(
`https://metamask.io/uninstalled?${new URLSearchParams({
`https://metamask.com/uninstalled?${new URLSearchParams({
av: testVersion,
}).toString()}`,
);
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/controllers/analytics/analytics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import { trackSegmentEventWhileOptedOut } from '../../lib/segment/custom-segment
import { getPlatform } from '../../lib/util';
import { ANONYMOUS_EVENT_PROPERTY } from './platform-adapter';

const EXTENSION_UNINSTALL_URL = 'https://metamask.io/uninstalled';
const EXTENSION_UNINSTALL_URL = 'https://metamask.com/uninstalled';

type SegmentTrackPayload = Omit<
SegmentEventPayload,
Expand Down
30 changes: 15 additions & 15 deletions app/scripts/lib/critical-error/critical-error-tab-handoff.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe('critical-error-repair session', () => {
CriticalErrorRepairAction.Reset,
]) {
it(`returns payload with stored ${repairAction} repairAction when repair session data is valid`, async () => {
const tabUrl = 'https://metamask.io/restoring#abc';
const tabUrl = 'https://metamask.com/restoring#abc';
Comment thread
gauthierpetetin marked this conversation as resolved.
Resolved
(browser.storage.local.get as jest.Mock).mockResolvedValueOnce({
[CRITICAL_ERROR_REPAIR_KEY]: {
repairAction,
Expand All @@ -85,7 +85,7 @@ describe('critical-error-repair session', () => {
}

it('defaults to recover when repairAction is missing', async () => {
const tabUrl = 'https://metamask.io/restoring#abc';
const tabUrl = 'https://metamask.com/restoring#abc';
(browser.storage.local.get as jest.Mock).mockResolvedValueOnce({
[CRITICAL_ERROR_REPAIR_KEY]: { tabUrl, tabId: 42 },
});
Expand All @@ -100,7 +100,7 @@ describe('critical-error-repair session', () => {
});

it('returns undefined tabId when tabId is not a number', async () => {
const tabUrl = 'https://metamask.io/restoring#abc';
const tabUrl = 'https://metamask.com/restoring#abc';
(browser.storage.local.get as jest.Mock).mockResolvedValueOnce({
[CRITICAL_ERROR_REPAIR_KEY]: { tabUrl },
});
Expand Down Expand Up @@ -185,7 +185,7 @@ describe('openRestoringTabAndReload', () => {
expect(browser.tabs.create).toHaveBeenCalledWith(
expect.objectContaining({
active: true,
url: expect.stringMatching(/^https:\/\/metamask\.io\/restoring#/u),
url: expect.stringMatching(/^https:\/\/metamask\.com\/restoring#/u),
}),
);

Expand Down Expand Up @@ -235,7 +235,7 @@ describe('handoffRestoringTabToExtension', () => {

await handoffRestoringTabToExtension(platform, {
tabId: undefined,
tabUrl: 'https://metamask.io/restoring#1',
tabUrl: 'https://metamask.com/restoring#1',
});

expect(browser.tabs.get).not.toHaveBeenCalled();
Expand All @@ -246,7 +246,7 @@ describe('handoffRestoringTabToExtension', () => {
});

it('updates tab when URL still matches', async () => {
const tabUrl = 'https://metamask.io/restoring#frag';
const tabUrl = 'https://metamask.com/restoring#frag';
(browser.tabs.get as jest.Mock).mockResolvedValueOnce({
id: 7,
url: tabUrl,
Expand All @@ -262,11 +262,11 @@ describe('handoffRestoringTabToExtension', () => {
expect(browser.tabs.create).not.toHaveBeenCalled();
});

it('updates tab when metamask.io redirected to locale-prefixed path', async () => {
const tabUrl = 'https://metamask.io/restoring#frag';
it('updates tab when metamask.com redirected to locale-prefixed path', async () => {
const tabUrl = 'https://metamask.com/restoring#frag';
(browser.tabs.get as jest.Mock).mockResolvedValueOnce({
id: 7,
url: 'https://metamask.io/en-GB/restoring#frag',
url: 'https://metamask.com/en-GB/restoring#frag',
});
(browser.tabs.update as jest.Mock).mockResolvedValueOnce({});

Expand All @@ -289,7 +289,7 @@ describe('handoffRestoringTabToExtension', () => {

await handoffRestoringTabToExtension(platform, {
tabId: 7,
tabUrl: 'https://metamask.io/restoring#frag',
tabUrl: 'https://metamask.com/restoring#frag',
});

expect(browser.tabs.update).not.toHaveBeenCalled();
Expand All @@ -302,14 +302,14 @@ describe('handoffRestoringTabToExtension', () => {
it('opens extension UI in a new tab when hash fragment differs', async () => {
(browser.tabs.get as jest.Mock).mockResolvedValueOnce({
id: 7,
url: 'https://metamask.io/restoring#different',
url: 'https://metamask.com/restoring#different',
});

(browser.tabs.create as jest.Mock).mockResolvedValueOnce({ id: 2 });

await handoffRestoringTabToExtension(platform, {
tabId: 7,
tabUrl: 'https://metamask.io/restoring#frag',
tabUrl: 'https://metamask.com/restoring#frag',
});

expect(browser.tabs.update).not.toHaveBeenCalled();
Expand All @@ -326,7 +326,7 @@ describe('handoffRestoringTabToExtension', () => {
await expect(
handoffRestoringTabToExtension(platform, {
tabId: 99,
tabUrl: 'https://metamask.io/restoring#frag',
tabUrl: 'https://metamask.com/restoring#frag',
}),
).resolves.toBeUndefined();

Expand All @@ -337,7 +337,7 @@ describe('handoffRestoringTabToExtension', () => {
});

it('opens extension UI in a new tab when tabs.update fails', async () => {
const tabUrl = 'https://metamask.io/restoring#frag';
const tabUrl = 'https://metamask.com/restoring#frag';
(browser.tabs.get as jest.Mock).mockResolvedValueOnce({
id: 7,
url: tabUrl,
Expand All @@ -362,7 +362,7 @@ describe('handoffRestoringTabToExtension', () => {

await handoffRestoringTabToExtension(platform, {
tabId: 7,
tabUrl: 'https://metamask.io/restoring#frag',
tabUrl: 'https://metamask.com/restoring#frag',
});

expect(browser.tabs.update).not.toHaveBeenCalled();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ async function tryHandoffViaRestoringTab(
}

const actual = new URL(tab.url);
// metamask.io may redirect to a locale-prefixed path (e.g. /en-GB/restoring)
// metamask.com may redirect to a locale-prefixed path (e.g. /en-GB/restoring)
if (
actual.origin !== expected.origin ||
!actual.pathname.endsWith('/restoring') ||
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/lib/open-update-tab-and-reload.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describe('openUpdateTabAndReload', () => {
await openUpdateTabAndReload(mockRequestSafeReload);

expect(browser.tabs.create).toHaveBeenCalledWith({
url: 'https://metamask.io/updating',
url: 'https://metamask.com/updating',
active: true,
});
expect(mockRequestSafeReload).toHaveBeenCalled();
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/lib/open-update-tab-and-reload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export async function openUpdateTabAndReload(
) {
try {
await browser.tabs.create({
url: 'https://metamask.io/updating',
url: 'https://metamask.com/updating',
active: true,
});
} catch (error) {
Expand Down
2 changes: 1 addition & 1 deletion shared/constants/critical-error-repair-session.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export const CRITICAL_ERROR_REPAIR_KEY = 'criticalErrorRepair';

export const METAMASK_RESTORING_PAGE_URL = 'https://metamask.io/restoring';
export const METAMASK_RESTORING_PAGE_URL = 'https://metamask.com/restoring';
2 changes: 1 addition & 1 deletion shared/lib/bridge-utils/security-alerts-api.util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
import { MultichainNetworks } from '../../constants/multichain/networks';
import { decimalToPrefixedHex } from '../conversion.utils';

const DOMAIN = 'https://metamask.io';
const DOMAIN = 'https://metamask.com';

export function isSecurityAlertsAPIEnabled() {
const isEnabled = process.env.SECURITY_ALERTS_API_ENABLED;
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/tests/update-modal/update-modal.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ describe('Update modal', function (this: Suite) {
// we need to mock the updating page that is opened when the user confirms the update
testSpecificMock: async (server: Mockttp) => {
await server
.forGet('https://metamask.io/updating')
.forGet('https://metamask.com/updating')
.thenCallback(() => ({
statusCode: 200,
body: '<title>MetaMask Updating</title><link rel="icon" href="data:image/png;base64,iVBORw0KGgo=">',
Expand Down
2 changes: 1 addition & 1 deletion ui/__mocks__/perps/perps-controller/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ export type SortButtonPreset =
* External resources and content for Perps education
*/
export const LEARN_MORE_CONFIG = {
ExternalUrl: 'https://metamask.io/perps',
ExternalUrl: 'https://metamask.com/perps',
Comment thread
gauthierpetetin marked this conversation as resolved.
Resolved
TitleKey: 'perps.tutorial.card.title',
DescriptionKey: 'perps.learn_more.description',
CtaKey: 'perps.learn_more.cta',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export const BASIC_FUNCTIONALITY_MIGRATION_BLOG_POST_LINK =
'https://metamask.io/news/basic-functionality-profile-setting';
'https://metamask.com/news/basic-functionality-profile-setting';

export const BASIC_FUNCTIONALITY_MIGRATION_PRIVACY_NOTICE_LINK =
'https://metamask.com/privacy-notice';
Expand Down
2 changes: 1 addition & 1 deletion ui/components/app/modals/pna25-modal/constants.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export const PNA25_BLOG_POST_LINK =
'https://metamask.io/news/updating-metamask-analytics';
'https://metamask.com/news/updating-metamask-analytics';

export enum Pna25NoticeAction {
Viewed = 'viewed',
Expand Down
3 changes: 2 additions & 1 deletion ui/helpers/constants/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ const _contractAddressLink = ZENDESK_URLS.CONTRACT_ADDRESS_WARNING;

export const TRANSACTION_SHIELD_SUPPORT_LINK = ZENDESK_URLS.TRANSACTION_SHIELD;

export const TRANSACTION_SHIELD_LINK = 'https://metamask.io/transaction-shield';
export const TRANSACTION_SHIELD_LINK =
'https://metamask.com/transaction-shield';

export const FIND_TRANSACTION_HASH_LINK = ZENDESK_URLS.FIND_TRANSACTION_HASH;
export const METAMETRICS_SETTINGS_LINK = ZENDESK_URLS.METAMETRICS_SETTINGS;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe('ShieldCoverageAlertMessage', () => {
expect(mockCaptureShieldCtaClickedEvent).toHaveBeenCalledWith({
source: ShieldMetricsSourceEnum.PostTransaction,
ctaActionClicked: ShieldCtaActionClickedEnum.WhatsCovered,
redirectToUrl: 'https://metamask.io/transaction-shield',
redirectToUrl: 'https://metamask.com/transaction-shield',
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
} from '../../../../../../shared/constants/subscriptions';

const SHIELD_LEARN_HOW_COVERAGE_WORKS_URL =
'https://metamask.io/transaction-shield';
'https://metamask.com/transaction-shield';

const COVERAGE_AMOUNT = '$10,000';

Expand Down
4 changes: 2 additions & 2 deletions ui/pages/money/constants/urls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* benefits" / "Learn more".
*/
export const MONEY_LANDING_URL =
'https://metamask.io/money?utm_source=extension';
'https://metamask.com/money?utm_source=extension';

/**
* mUSD price page — same destination mobile opens for "Meet mUSD".
*/
export const MUSD_PRICE_URL =
'https://metamask.io/price/metamask-usd?utm_source=extension';
'https://metamask.com/price/metamask-usd?utm_source=extension';
13 changes: 8 additions & 5 deletions ui/pages/money/money-home-page.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ describe('MoneyHomePage', () => {
});

expect(global.platform.openTab).toHaveBeenCalledWith({
url: 'https://metamask.io/money?utm_source=extension',
url: 'https://metamask.com/money?utm_source=extension',
});
});

Expand Down Expand Up @@ -661,13 +661,16 @@ describe('MoneyHomePage', () => {
screen.getByRole('link', { name: messages.moneyMeetMusd.message }),
).toHaveAttribute(
'href',
'https://metamask.io/price/metamask-usd?utm_source=extension',
'https://metamask.com/price/metamask-usd?utm_source=extension',
);
expect(
screen.getByRole('link', {
name: messages.moneyExploreBenefits.message,
}),
).toHaveAttribute('href', 'https://metamask.io/money?utm_source=extension');
).toHaveAttribute(
'href',
'https://metamask.com/money?utm_source=extension',
);
expect(
screen.getByRole('link', {
name: messages.moneyHowYourMoneyGrows.message,
Expand Down Expand Up @@ -796,7 +799,7 @@ describe('MoneyHomePage', () => {
fireEvent.click(screen.getByTestId('money-condensed-info-card-musd'));

expect(global.platform.openTab).toHaveBeenCalledWith({
url: 'https://metamask.io/price/metamask-usd?utm_source=extension',
url: 'https://metamask.com/price/metamask-usd?utm_source=extension',
});
});

Expand All @@ -819,7 +822,7 @@ describe('MoneyHomePage', () => {
fireEvent.click(screen.getByTestId('money-condensed-info-card-benefits'));

expect(global.platform.openTab).toHaveBeenCalledWith({
url: 'https://metamask.io/money?utm_source=extension',
url: 'https://metamask.com/money?utm_source=extension',
});
});

Expand Down
Loading