From 83de11f80a323d241e76c343aff69f7d6c75c55a Mon Sep 17 00:00:00 2001 From: Michael Gartner Date: Tue, 23 Dec 2025 12:02:26 -0600 Subject: [PATCH] =?UTF-8?q?Revert=20"Update=20email=20contact=20from=20sup?= =?UTF-8?q?port@samepage.network=20to=20mclicks+samepag=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 993a299adf7bc3e5de13e2e01408d54a0b97d4a1. --- api/email.ts | 2 +- api/errors/post.ts | 8 ++++---- api/snsubcriber.ts | 16 ++++++++-------- api/stripe/post.ts | 6 +++--- app/components/DefaultErrorBoundary.tsx | 4 ++-- app/routes/__private/user/employees.new.tsx | 2 +- app/routes/__public/oauth/$id.tsx | 2 +- package/backend/sendEmail.server.ts | 2 +- package/components/EmailLayout.tsx | 2 +- package/components/HomeDashboardTab.tsx | 2 +- package/internal/saveAndApply.ts | 2 +- package/internal/sendExtensionError.ts | 2 +- package/protocols/sharePageWithNotebook.ts | 2 +- package/utils/changeState.ts | 2 +- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/api/email.ts b/api/email.ts index c14aede1..618bf3e9 100644 --- a/api/email.ts +++ b/api/email.ts @@ -41,6 +41,6 @@ export const handler = ({ return sendEmail({ ...params, body: RENDERS[bodyComponent](bodyProps), - from: "mclicks+samepage@gmail.com", + from: "support@samepage.network", }); }; diff --git a/api/errors/post.ts b/api/errors/post.ts index 26ad7d30..98247529 100644 --- a/api/errors/post.ts +++ b/api/errors/post.ts @@ -46,7 +46,7 @@ const logic = async (body: Record) => { const result = zBody.safeParse(body); if (!result.success) { const messageId = await sendEmail({ - to: "mclicks+samepage@gmail.com", + to: "support@samepage.network", subject: `Failed to parse error request body`, body: EmailLayout({ children: `Failed to parse request. Errors:\n${parseZodError( @@ -54,7 +54,7 @@ const logic = async (body: Record) => { )}\nInput:${JSON.stringify(body, null, 4)}`, }), // Can remove this when we migrate sendEmail from `vargas` to `samepage` - from: "mclicks+samepage@gmail.com", + from: "support@samepage.network", }); return { success: false, messageId }; } @@ -107,7 +107,7 @@ const logic = async (body: Record) => { return { success: true, messageId: uuid }; } const messageId = await sendEmail({ - to: "mclicks+samepage@gmail.com", + to: "support@samepage.network", subject: `SamePage Extension Error: ${type}`, body: ExtensionErrorEmail({ ...notebook, @@ -125,7 +125,7 @@ const logic = async (body: Record) => { case "web-app-error": { const { path, stack, data } = args; const messageId = await sendEmail({ - to: "mclicks+samepage@gmail.com", + to: "support@samepage.network", subject: `SamePage webapp path failed: ${path}`, body: WebAppErrorEmail({ stack, path, data }), }); diff --git a/api/snsubcriber.ts b/api/snsubcriber.ts index 061d6021..e3ac051e 100644 --- a/api/snsubcriber.ts +++ b/api/snsubcriber.ts @@ -158,7 +158,7 @@ const logic = async ({ Data: `Your RoamJS site is almost ready!`, }, }, - Source: "mclicks+samepage@gmail.com", + Source: "support@samepage.network", }); } else { await ses.sendEmail({ @@ -177,7 +177,7 @@ const logic = async ({ Data: `Your RoamJS site is now live!`, }, }, - Source: "mclicks+samepage@gmail.com", + Source: "support@samepage.network", }); } } @@ -215,7 +215,7 @@ const logic = async ({ Body: { Text: { Charset: "UTF-8", - Data: `Your SamePage website is no longer live. There are no sites connected to your notebook.\n\nIf you believe you received this email in error, please reach out to mclicks+samepage@gmail.com.`, + Data: `Your SamePage website is no longer live. There are no sites connected to your notebook.\n\nIf you believe you received this email in error, please reach out to support@samepage.network.`, }, }, Subject: { @@ -223,7 +223,7 @@ const logic = async ({ Data: `Your SamePage website has successfully shutdown.`, }, }, - Source: "mclicks+samepage@gmail.com", + Source: "support@samepage.network", }); } else { console.error("Could not find Shutdown Callback Status"); @@ -283,7 +283,7 @@ const logic = async ({ Data: `Your RoamJS static site is awaiting validation.`, }, }, - Source: "mclicks+samepage@gmail.com", + Source: "support@samepage.network", }); } } else if (domainParts > 2) { @@ -313,7 +313,7 @@ const logic = async ({ Data: `Your RoamJS static site is awaiting validation.`, }, }, - Source: "mclicks+samepage@gmail.com", + Source: "support@samepage.network", }); } } @@ -335,7 +335,7 @@ const logic = async ({ if (environment === "production") { await ses.sendEmail({ Destination: { - ToAddresses: ["mclicks+samepage@gmail.com"], + ToAddresses: ["support@samepage.network"], }, Message: { Body: { @@ -349,7 +349,7 @@ const logic = async ({ Data: `User's Static Site failed to deploy`, }, }, - Source: "mclicks+samepage@gmail.com", + Source: "support@samepage.network", }); } } else if (ResourceStatus === "DELETE_FAILED") { diff --git a/api/stripe/post.ts b/api/stripe/post.ts index 1c61cf11..225fb8f7 100644 --- a/api/stripe/post.ts +++ b/api/stripe/post.ts @@ -119,7 +119,7 @@ const recordTransaction = async ( }); await sendEmail({ - to: "mclicks+samepage@gmail.com", + to: "support@samepage.network", subject: "SamePage Transaction Recorded", body: `You can verify the transaction at ${out.data.spreadsheetUrl}`, }); @@ -219,7 +219,7 @@ export const handler: APIGatewayProxyHandler = async (event) => { body: WelcomeClientEmail({ temporaryPassword }), }); await sendEmail({ - to: "mclicks+samepage@gmail.com", + to: "support@samepage.network", subject: "New SamePage Customer", body: NewCustomerEmail({ email: customerEmail, @@ -241,7 +241,7 @@ export const handler: APIGatewayProxyHandler = async (event) => { .catch(() => "ERROR"); if (subscription.status !== "active") await sendEmail({ - to: "mclicks+samepage@gmail.com", + to: "support@samepage.network", subject: "SamePage Subscription Updated", body: SubscriptionUpdateEmail({ email: customerEmail, diff --git a/app/components/DefaultErrorBoundary.tsx b/app/components/DefaultErrorBoundary.tsx index 10b1da06..4f97f07a 100644 --- a/app/components/DefaultErrorBoundary.tsx +++ b/app/components/DefaultErrorBoundary.tsx @@ -96,14 +96,14 @@ const DefaultErrorBoundary: V2_ErrorBoundaryComponent = {" "} to{" "} - mclicks+samepage@gmail.com + support@samepage.network

diff --git a/app/routes/__private/user/employees.new.tsx b/app/routes/__private/user/employees.new.tsx index 927f6a00..af02d3f9 100644 --- a/app/routes/__private/user/employees.new.tsx +++ b/app/routes/__private/user/employees.new.tsx @@ -22,7 +22,7 @@ const EmployeesNewPage = () => {

{errorMessage && (

- {errorMessage}. Please contact mclicks+samepage@gmail.com. + {errorMessage}. Please contact support@samepage.network.

)} diff --git a/app/routes/__public/oauth/$id.tsx b/app/routes/__public/oauth/$id.tsx index 672baadd..3dbd6aa2 100644 --- a/app/routes/__public/oauth/$id.tsx +++ b/app/routes/__public/oauth/$id.tsx @@ -45,7 +45,7 @@ const OauthConnectionPage = (): React.ReactElement => { } else { setMessage( `If you are using the app instead of the browser, please authorize in app. - Otherwise please contact mclicks+samepage@gmail.com` + Otherwise please contact support@samepage.network` ); } }; diff --git a/package/backend/sendEmail.server.ts b/package/backend/sendEmail.server.ts index cbc2c312..27567f8e 100644 --- a/package/backend/sendEmail.server.ts +++ b/package/backend/sendEmail.server.ts @@ -6,7 +6,7 @@ import mockEmailLocally from "./mockEmailLocally.server"; const ses = new SES({ endpoint: process.env.AWS_ENDPOINT, }); -export const supportEmail = "mclicks+samepage@gmail.com"; +export const supportEmail = "support@samepage.network"; const sendEmail = async ({ to = supportEmail, diff --git a/package/components/EmailLayout.tsx b/package/components/EmailLayout.tsx index 650607d6..ff804eec 100644 --- a/package/components/EmailLayout.tsx +++ b/package/components/EmailLayout.tsx @@ -56,7 +56,7 @@ const EmailLayout = ({ children }: React.PropsWithChildren) => ( style={{ width: "50%", textAlign: "right", display: "inline-block" }} > Contact Support diff --git a/package/components/HomeDashboardTab.tsx b/package/components/HomeDashboardTab.tsx index 92f745dd..6aa5702e 100644 --- a/package/components/HomeDashboardTab.tsx +++ b/package/components/HomeDashboardTab.tsx @@ -40,7 +40,7 @@ const HomeDashboardTab = ({ url }: { url: string }): React.ReactElement => {