Skip to content
Merged
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 api/email.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ export const handler = ({
return sendEmail({
...params,
body: RENDERS[bodyComponent](bodyProps),
from: "mclicks+samepage@gmail.com",
from: "support@samepage.network",
});
};
8 changes: 4 additions & 4 deletions api/errors/post.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ const logic = async (body: Record<string, unknown>) => {
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(
result.error
)}\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 };
}
Expand Down Expand Up @@ -107,7 +107,7 @@ const logic = async (body: Record<string, unknown>) => {
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,
Expand All @@ -125,7 +125,7 @@ const logic = async (body: Record<string, unknown>) => {
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 }),
});
Expand Down
16 changes: 8 additions & 8 deletions api/snsubcriber.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand All @@ -177,7 +177,7 @@ const logic = async ({
Data: `Your RoamJS site is now live!`,
},
},
Source: "mclicks+samepage@gmail.com",
Source: "support@samepage.network",
});
}
}
Expand Down Expand Up @@ -215,15 +215,15 @@ 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: {
Charset: "UTF-8",
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");
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -313,7 +313,7 @@ const logic = async ({
Data: `Your RoamJS static site is awaiting validation.`,
},
},
Source: "mclicks+samepage@gmail.com",
Source: "support@samepage.network",
});
}
}
Expand All @@ -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: {
Expand All @@ -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") {
Expand Down
6 changes: 3 additions & 3 deletions api/stripe/post.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}`,
});
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions app/components/DefaultErrorBoundary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ const DefaultErrorBoundary: V2_ErrorBoundaryComponent =
</a>{" "}
to{" "}
<a
href={`mailto:mclicks+samepage@gmail.com`}
href={`mailto:support@samepage.network`}
target={"_blank"}
rel={"noreferrer"}
className={
"text-sky-800 underline hover:no-underline active:text-sky-900"
}
>
mclicks+samepage@gmail.com
support@samepage.network
</a>
</p>
</main>
Expand Down
2 changes: 1 addition & 1 deletion app/routes/__private/user/employees.new.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const EmployeesNewPage = () => {
</p>
{errorMessage && (
<p className="text-red-500 mb-4">
{errorMessage}. Please contact mclicks+samepage@gmail.com.
{errorMessage}. Please contact support@samepage.network.
</p>
)}
<Button>Hire</Button>
Expand Down
2 changes: 1 addition & 1 deletion app/routes/__public/oauth/$id.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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`
);
}
};
Expand Down
2 changes: 1 addition & 1 deletion package/backend/sendEmail.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion package/components/EmailLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const EmailLayout = ({ children }: React.PropsWithChildren) => (
style={{ width: "50%", textAlign: "right", display: "inline-block" }}
>
<a
href={`mailto:mclicks+samepage@gmail.com`}
href={`mailto:support@samepage.network`}
style={{ color: "#4d9bd7", textDecoration: "none" }}
>
Contact Support
Expand Down
2 changes: 1 addition & 1 deletion package/components/HomeDashboardTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const HomeDashboardTab = ({ url }: { url: string }): React.ReactElement => {
<TextInput
name={"email"}
label={"Email"}
placeholder="mclicks+samepage@gmail.com"
placeholder="support@samepage.network"
/>
<BaseInput
type={"password"}
Expand Down
2 changes: 1 addition & 1 deletion package/internal/saveAndApply.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const saveAndApply = ({
dispatchAppEvent({
type: "log",
id: "update-failure",
content: `Failed to apply new change - Error report ${data.messageId} has been sent to mclicks+samepage@gmail.com`,
content: `Failed to apply new change - Error report ${data.messageId} has been sent to support@samepage.network`,
intent: "warning",
});
});
Expand Down
2 changes: 1 addition & 1 deletion package/internal/sendExtensionError.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const sendExtensionError = ({
dispatchAppEvent({
type: "log",
intent: "error",
content: `Failed to send \`${type}\` extension error to SamePage team: ${e.message}\n\nContact mclicks+samepage@gmail.com directly if you need assistance.`,
content: `Failed to send \`${type}\` extension error to SamePage team: ${e.message}\n\nContact support@samepage.network directly if you need assistance.`,
id: "send-extension-error",
});
return { messageId: v4() };
Expand Down
2 changes: 1 addition & 1 deletion package/protocols/sharePageWithNotebook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ const setupSharePageWithNotebook = ({
dispatchAppEvent({
type: "log",
intent: "error",
content: `Failed to encode document. Error report ${data.messageId} has been sent to mclicks+samepage@gmail.com`,
content: `Failed to encode document. Error report ${data.messageId} has been sent to support@samepage.network`,
id: `encode-error`,
});
});
Expand Down
2 changes: 1 addition & 1 deletion package/utils/changeState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const changeState = async ({
dispatchAppEvent({
type: "log",
intent: "error",
content: `Failed to parse document. Error report ${data.messageId} has been sent to mclicks+samepage@gmail.com`,
content: `Failed to parse document. Error report ${data.messageId} has been sent to support@samepage.network`,
id: `encode-parse-error`,
});
return undefined;
Expand Down
Loading