From fb85e02bd5474e2ebb222e5520078998b3283df8 Mon Sep 17 00:00:00 2001 From: MuckT Date: Sat, 10 Feb 2024 20:34:03 -0800 Subject: [PATCH 1/6] fix(mobile): account for address bar height --- index.html | 2 +- src/component-library/components/Error/Error.tsx | 2 +- .../components/HeaderDropdown/HeaderDropdown.tsx | 3 ++- .../components/OnboardingStep/OnboardingStep.tsx | 2 +- src/component-library/components/SideNav/SideNav.tsx | 2 +- src/component-library/pages/ErrorPage/ErrorPage.tsx | 2 +- src/pages/inbox.tsx | 6 +++--- src/pages/index.tsx | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/index.html b/index.html index 0212e068..0c73d614 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ - + diff --git a/src/component-library/components/Error/Error.tsx b/src/component-library/components/Error/Error.tsx index d958aa6d..427a9c3f 100644 --- a/src/component-library/components/Error/Error.tsx +++ b/src/component-library/components/Error/Error.tsx @@ -17,7 +17,7 @@ export const Error = ({ errorText, onConnect }: ErrorProps) => { const { t } = useTranslation(); return ( -
+

diff --git a/src/component-library/components/HeaderDropdown/HeaderDropdown.tsx b/src/component-library/components/HeaderDropdown/HeaderDropdown.tsx index 7bbe6edf..1a8c7de1 100644 --- a/src/component-library/components/HeaderDropdown/HeaderDropdown.tsx +++ b/src/component-library/components/HeaderDropdown/HeaderDropdown.tsx @@ -51,8 +51,9 @@ export const HeaderDropdown = ({ data-testid={testId} type="button" className={classNames( - "text-lg mr-2 cursor-pointer", + "mr-2 cursor-pointer truncate", activeTab === name ? "font-bold" : "", + isMobileView ? "text-md" : "text-lg", )} onClick={() => { setActiveTab(name as ActiveTab); diff --git a/src/component-library/components/OnboardingStep/OnboardingStep.tsx b/src/component-library/components/OnboardingStep/OnboardingStep.tsx index a1d96ce1..ce39ff2e 100644 --- a/src/component-library/components/OnboardingStep/OnboardingStep.tsx +++ b/src/component-library/components/OnboardingStep/OnboardingStep.tsx @@ -51,7 +51,7 @@ export const OnboardingStep = ({ const { header, subheader, cta, subtext, disconnect_tip } = stepInfo; return ( -
+
{isLoading ? ( ) : ( diff --git a/src/component-library/components/SideNav/SideNav.tsx b/src/component-library/components/SideNav/SideNav.tsx index c242e18f..e55eb730 100644 --- a/src/component-library/components/SideNav/SideNav.tsx +++ b/src/component-library/components/SideNav/SideNav.tsx @@ -147,7 +147,7 @@ const SideNav = ({ "flex-col", "justify-between", "items-center", - "h-screen", + "h-dvh", "bg-white", isOpen ? "px-6" : "px-3", "border-r", diff --git a/src/component-library/pages/ErrorPage/ErrorPage.tsx b/src/component-library/pages/ErrorPage/ErrorPage.tsx index 9ab571d5..50677a0e 100644 --- a/src/component-library/pages/ErrorPage/ErrorPage.tsx +++ b/src/component-library/pages/ErrorPage/ErrorPage.tsx @@ -20,7 +20,7 @@ export const ErrorPage = ({ const { t } = useTranslation(); return ( -
+
{icon}
{header || t("status_messaging.error_1_header")} diff --git a/src/pages/inbox.tsx b/src/pages/inbox.tsx index ab46a5f1..9aaea5d6 100644 --- a/src/pages/inbox.tsx +++ b/src/pages/inbox.tsx @@ -132,7 +132,7 @@ const Inbox: React.FC<{ children?: React.ReactNode }> = () => { (!recipientAddress && !startedFirstMessage) ? ( <> -
+
= () => { {size[0] > TAILWIND_MD_BREAKPOINT || recipientAddress || startedFirstMessage ? ( -
+
{!conversations.length && !loadingConversations && !startedFirstMessage ? ( @@ -154,7 +154,7 @@ const Inbox: React.FC<{ children?: React.ReactNode }> = () => { /> ) : ( // Full container including replies -
+
{activeMessage && selectedConversation ? (
diff --git a/src/pages/index.tsx b/src/pages/index.tsx index ec0c7375..8d41674d 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -48,7 +48,7 @@ const OnboardingPage = () => { }, [status]); return ( -
+
Date: Sat, 10 Feb 2024 21:51:53 -0800 Subject: [PATCH 2/6] fix: adjust vercel anayltics --- index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.html b/index.html index 0c73d614..1fae1396 100644 --- a/index.html +++ b/index.html @@ -8,6 +8,9 @@ rel="stylesheet" /> Wallet DM + From 1c5e25e5c31f32e9bbf411045386cd66887e00ba Mon Sep 17 00:00:00 2001 From: MuckT Date: Sat, 10 Feb 2024 22:02:20 -0800 Subject: [PATCH 3/6] Revert "fix: adjust vercel anayltics" This reverts commit 9008399542671131aee4dc6ce6014f2e37a37ca5. --- index.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/index.html b/index.html index 1fae1396..0c73d614 100644 --- a/index.html +++ b/index.html @@ -8,9 +8,6 @@ rel="stylesheet" /> Wallet DM - From cdbe93ea785cdf2a0d52d3a87c15ed39c5be8ae3 Mon Sep 17 00:00:00 2001 From: MuckT Date: Sat, 10 Feb 2024 23:09:00 -0800 Subject: [PATCH 4/6] style: remove extra padding bottom --- src/controllers/FullConversationController.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/FullConversationController.tsx b/src/controllers/FullConversationController.tsx index 93a6d316..53136a22 100644 --- a/src/controllers/FullConversationController.tsx +++ b/src/controllers/FullConversationController.tsx @@ -105,7 +105,7 @@ export const FullConversationController: React.FC< id="scrollableDiv" // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex tabIndex={0} - className="w-full h-full flex flex-col overflow-auto relative pb-4"> + className="w-full h-full flex flex-col overflow-auto relative"> {effect === "SNOW" ? ( ) : effect === "RAIN" ? ( From 44f751364c9911c157bc66a8ced104bd4eb614e7 Mon Sep 17 00:00:00 2001 From: MuckT Date: Sat, 10 Feb 2024 23:23:23 -0800 Subject: [PATCH 5/6] test(e2e): run cypress in chrome and add open script --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index fe42793f..dccf2f5c 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "preview": "vite preview", "lint": "eslint . --ignore-path .gitignore", "typecheck": "tsc", - "cypress": "cypress run", + "cypress": "cypress run --browser chrome", + "cypress:open": "cypress open --browser chrome", "fmt:check": "prettier -c --ignore-path .gitignore --ignore-path .prettierignore .", "fmt:fix": "prettier -w --ignore-path .gitignore --ignore-path .prettierignore .", "e2e:headless": "start-server-and-test dev http://localhost:5173 cypress", From 7a4a3a7f996ed75fabc64580b33580f581630838 Mon Sep 17 00:00:00 2001 From: MuckT Date: Sat, 10 Feb 2024 23:40:30 -0800 Subject: [PATCH 6/6] ci(e2e): specify chrome browser --- .github/workflows/cypress.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 09199348..e12325c7 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -17,6 +17,7 @@ jobs: - name: Cypress run uses: cypress-io/github-action@v5 with: + browser: chrome build: npm run build start: npm run dev env: