From c3c43c19436c89a3212fea3565ba778a2783317a Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Fri, 29 Jul 2022 23:30:15 +0300
Subject: [PATCH 1/3] Use transform for menu animation

Closes #827 Closes #835
---
 app/styles/layout.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/styles/layout.css b/app/styles/layout.css
index a41bd5521..94961815c 100644
--- a/app/styles/layout.css
+++ b/app/styles/layout.css
@@ -104,19 +104,19 @@
   width: max-content;
   height: max-content;
   margin-top: 10rem;
-  margin-right: -12rem;
   backdrop-filter: blur(10px) brightness(75%);
   background-color: var(--bg-lighter);
   background-image: url("/svg/background-pattern.svg");
   border-end-start-radius: var(--rounded);
   border-start-start-radius: var(--rounded);
   overflow-y: auto;
-  transition: margin-right 0.5s;
+  transform: translateX(100%);
+  transition: transform 0.5s;
   transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 }
 
 .layout__menu.expanded {
-  margin-right: 0;
+  transform: none;
 }
 
 .layout__menu__link__icon {

From dcd0918bce1cab478d66cc7d9614471a097d1eea Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Fri, 29 Jul 2022 23:57:44 +0300
Subject: [PATCH 2/3] Fix menu overflow on Safari

Closes #835 hopefully for real this time
---
 app/root.tsx          | 2 +-
 app/styles/layout.css | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/root.tsx b/app/root.tsx
index ce6800e9a..69d7c738a 100644
--- a/app/root.tsx
+++ b/app/root.tsx
@@ -43,7 +43,7 @@ export const links: LinksFunction = () => {
 export const meta: MetaFunction = () => ({
   charset: "utf-8",
   title: "sendou.ink",
-  viewport: "width=device-width,initial-scale=1,minimum-scale=1.0",
+  viewport: "width=device-width,initial-scale=1",
 });
 
 export interface RootLoaderData {
diff --git a/app/styles/layout.css b/app/styles/layout.css
index 94961815c..86d9effd2 100644
--- a/app/styles/layout.css
+++ b/app/styles/layout.css
@@ -97,14 +97,13 @@
 }
 
 .layout__menu {
-  position: absolute;
+  position: fixed;
   z-index: 500;
   top: 0;
   right: 0;
   width: max-content;
   height: max-content;
   margin-top: 10rem;
-  backdrop-filter: blur(10px) brightness(75%);
   background-color: var(--bg-lighter);
   background-image: url("/svg/background-pattern.svg");
   border-end-start-radius: var(--rounded);

From a209d6afeb54a550fba4a1d8ead3390a66e798a7 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Sat, 30 Jul 2022 00:27:26 +0300
Subject: [PATCH 3/3] Manage plus tier query param on modal switch

---
 app/routes/plus/suggestions.tsx                       | 4 ++--
 app/routes/plus/suggestions/comment.$tier.$userId.tsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/routes/plus/suggestions.tsx b/app/routes/plus/suggestions.tsx
index b1ba4749e..91bd9b3f2 100644
--- a/app/routes/plus/suggestions.tsx
+++ b/app/routes/plus/suggestions.tsx
@@ -221,7 +221,7 @@ export default function PlusSuggestionsPage() {
               {canSuggestNewUserFE({ user, suggestions: data.suggestions }) ? (
                 // TODO: resetScroll={false} https://twitter.com/ryanflorence/status/1527775882797907969
                 <LinkButton
-                  to="new"
+                  to={`new${tierVisible ? `?tier=${tierVisible}` : ""}`}
                   data-cy="new-suggest-button"
                   prefetch="render"
                 >
@@ -366,7 +366,7 @@ function SuggestedUser({
             className="plus__comment-button"
             tiny
             variant="outlined"
-            to={`comment/${tier}/${suggested.suggestedUser.id}`}
+            to={`comment/${tier}/${suggested.suggestedUser.id}?tier=${tier}`}
             data-cy="comment-button"
             prefetch="render"
           >
diff --git a/app/routes/plus/suggestions/comment.$tier.$userId.tsx b/app/routes/plus/suggestions/comment.$tier.$userId.tsx
index fbea18b55..5a3b919dd 100644
--- a/app/routes/plus/suggestions/comment.$tier.$userId.tsx
+++ b/app/routes/plus/suggestions/comment.$tier.$userId.tsx
@@ -60,7 +60,7 @@ export const action: ActionFunction = async ({ request }) => {
     ...nextNonCompletedVoting(new Date()),
   });
 
-  return redirect(plusSuggestionPage());
+  return redirect(plusSuggestionPage(data.tier));
 };
 
 export default function PlusCommentModalPage() {