From cdc2624cafa4d895cb86591b39c6b23580cea645 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 15 Dec 2023 09:52:49 -0800
Subject: [PATCH 1/2] update submit button in team website add form

---
 src/app/(main)/settings/teams/[id]/TeamWebsiteAddForm.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/(main)/settings/teams/[id]/TeamWebsiteAddForm.tsx b/src/app/(main)/settings/teams/[id]/TeamWebsiteAddForm.tsx
index 64a0c58e..ee169886 100644
--- a/src/app/(main)/settings/teams/[id]/TeamWebsiteAddForm.tsx
+++ b/src/app/(main)/settings/teams/[id]/TeamWebsiteAddForm.tsx
@@ -65,7 +65,7 @@ export function TeamWebsiteAddForm({
             </GridColumn>
           </WebsitesDataTable>
           <FormButtons flex>
-            <SubmitButton disabled={selected?.length === 0}>
+            <SubmitButton variant="primary" disabled={selected?.length === 0}>
               {formatMessage(labels.addWebsite)}
             </SubmitButton>
             <Button onClick={onClose}>{formatMessage(labels.cancel)}</Button>

From 8f2fac10d10d958291227f9c275cc2eb16193816 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 19 Dec 2023 19:03:53 -0800
Subject: [PATCH 2/2] fix formatvalue for city showing undefined

---
 src/components/hooks/useFormat.ts       | 4 ++--
 src/components/metrics/RegionsTable.tsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/hooks/useFormat.ts b/src/components/hooks/useFormat.ts
index 06585e49..3057e9d8 100644
--- a/src/components/hooks/useFormat.ts
+++ b/src/components/hooks/useFormat.ts
@@ -2,7 +2,7 @@ import useMessages from './useMessages';
 import { BROWSERS } from 'lib/constants';
 import useLocale from './useLocale';
 import useCountryNames from './useCountryNames';
-import regions from 'public/iso-3166-2.json';
+import regions from '../../../public/iso-3166-2.json';
 
 export function useFormat() {
   const { formatMessage, labels } = useMessages();
@@ -23,7 +23,7 @@ export function useFormat() {
   };
 
   const formatCity = (value: string, country?: string): string => {
-    return `${value}, ${countryNames[country]}`;
+    return countryNames[country] ? `${value}, ${countryNames[country]}` : value;
   };
 
   const formatDevice = (value: string): string => {
diff --git a/src/components/metrics/RegionsTable.tsx b/src/components/metrics/RegionsTable.tsx
index 187e3768..ee95d58e 100644
--- a/src/components/metrics/RegionsTable.tsx
+++ b/src/components/metrics/RegionsTable.tsx
@@ -4,7 +4,7 @@ import useLocale from 'components/hooks/useLocale';
 import useMessages from 'components/hooks/useMessages';
 import useCountryNames from 'components/hooks/useCountryNames';
 import MetricsTable, { MetricsTableProps } from './MetricsTable';
-import regions from 'public/iso-3166-2.json';
+import regions from '../../../public/iso-3166-2.json';
 
 export function RegionsTable(props: MetricsTableProps) {
   const { locale } = useLocale();