Merge pull request midday-ai#200 from midday-ai/feature/eu-continent-…

…header Use header
zvizvi · Jul 28, 2024 · f17e2bf · f17e2bf
2 parents 70ed0b7 + 63425b2
commit f17e2bf
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 76 deletions.
diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json
@@ -41,7 +41,7 @@
     "ai": "^3.2.37",
     "change-case": "^5.4.4",
     "dub": "^0.34.2",
-    "framer-motion": "^11.3.18",
+    "framer-motion": "^11.3.19",
     "geist": "^1.3.1",
     "headless-currency-input": "^1.1.0",
     "loops": "1.0.1",

diff --git a/apps/dashboard/src/app/[locale]/(public)/login/page.tsx b/apps/dashboard/src/app/[locale]/(public)/login/page.tsx
@@ -6,7 +6,7 @@ import { GoogleSignIn } from "@/components/google-sign-in";
 import { OTPSignIn } from "@/components/otp-sign-in";
 import { SlackSignIn } from "@/components/slack-sign-in";
 import { Cookies } from "@/utils/constants";
-import { getCountryCode, isEUCountry } from "@midday/location";
+import { isEU } from "@midday/location";
 import {
   Accordion,
   AccordionContent,
@@ -28,11 +28,10 @@ export default async function Page(params) {
     return <DesktopCommandMenuSignIn />;
   }
 
-  const countryCode = getCountryCode();
-  const isEU = isEUCountry(countryCode);
   const cookieStore = cookies();
   const preferred = cookieStore.get(Cookies.PreferredSignInProvider);
-  const showTrackingConsent = isEU && !cookieStore.has(Cookies.TrackingConsent);
+  const showTrackingConsent =
+    isEU() && !cookieStore.has(Cookies.TrackingConsent);
   const { device } = userAgent({ headers: headers() });
 
   let moreSignInOptions = null;

diff --git a/apps/engine/package.json b/apps/engine/package.json
@@ -12,7 +12,7 @@
     "@hono/swagger-ui": "^0.4.0",
     "@hono/zod-openapi": "^0.15.1",
     "@hono/zod-validator": "^0.2.2",
-    "hono": "^4.5.1",
+    "hono": "^4.5.2",
     "plaid": "^26.0.0",
     "typesense": "^1.8.2",
     "xior": "^0.5.5",

diff --git a/apps/website/package.json b/apps/website/package.json
@@ -23,7 +23,7 @@
     "@uidotdev/usehooks": "^2.4.1",
     "d3": "^7.9.0",
     "date-fns": "^3.6.0",
-    "framer-motion": "^11.3.18",
+    "framer-motion": "^11.3.19",
     "geist": "^1.3.1",
     "next": "14.2.1",
     "next-mdx-remote": "^5.0.0",

diff --git a/bun.lockb b/bun.lockb
diff --git a/packages/location/src/countries.ts b/packages/location/src/countries.ts
diff --git a/packages/location/src/index.ts b/packages/location/src/index.ts
@@ -1,12 +1,9 @@
 import { headers } from "next/headers";
-import { EU_COUNTRY_CODES } from "./countries";
 import countries from "./countries.json";
 import flags from "./country-flag";
 
 export function getCountryCode() {
-  const countryCode = headers().get("x-vercel-ip-country") || "SE";
-
-  return countryCode;
+  return headers().get("x-vercel-ip-country") || "SE";
 }
 
 export function getCountryInfo() {
@@ -27,12 +24,10 @@ export function getCountryInfo() {
   };
 }
 
-export function isEUCountry(countryCode: string) {
-  if (EU_COUNTRY_CODES.includes(countryCode)) {
-    return true;
-  }
+export function isEU() {
+  const continent = headers().get("x-vercel-ip-continent") || "EU";
 
-  return false;
+  return continent === "EU";
 }
 
 export function getCountry() {