Skip to content

fix(companion): persist region in extension and fix iOS delete account link #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
PeerRich wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(companion): persist region in extension and fix iOS delete account link #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion apps/extension/entrypoints/background/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,7 @@ export default defineBackground(() => {

if (message.action === "sync-oauth-tokens") {
const tokens = message.tokens as OAuthTokens | null;
const region: "us" | "eu" = message.region === "eu" ? "eu" : "us";

if (isRateLimited()) {
devLog.warn("Token sync rate limited");
Expand All @@ -417,7 +418,13 @@ export default defineBackground(() => {
return true;
}

validateTokens(tokens)
const persistRegion = new Promise<void>((resolve) => {
if (!storageAPI?.local) return resolve();
storageAPI.local.set({ [REGION_STORAGE_KEY]: region }, () => resolve());
});

persistRegion
.then(() => validateTokens(tokens))
.then((isValid) => {
if (!isValid) {
devLog.warn("Token sync rejected: invalid tokens");
Expand Down
2 changes: 1 addition & 1 deletion apps/mobile/app/(tabs)/(more)/index.ios.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ export default function More() {
>
<TouchableOpacity
onPress={() =>
openInAppBrowser("https://app.cal.com/settings/my-account/profile", "Delete Account")
openInAppBrowser(`${getCalAppUrl()}/settings/my-account/profile`, "Delete Account")
}
style={{
flexDirection: "row",
Expand Down
Loading