Merge branch 'main' into chore/bump-ds

ensdomains · Jun 18, 2023 · 5f78fd6 · 5f78fd6
2 parents 575ed24 + 3245df3
commit 5f78fd6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/src/components/@molecules/Hamburger/MainMenu.tsx b/src/components/@molecules/Hamburger/MainMenu.tsx
@@ -302,7 +302,7 @@ const MainMenu = ({
           }
           return (
             <BaseLink href={route.href} passHref key={route.href}>
-              <RouteItem>
+              <RouteItem {...(route.href.startsWith('http') ? { target: '_blank' } : {})}>
                 <Typography>{t(route.label)}</Typography>
               </RouteItem>
             </BaseLink>

diff --git a/src/components/SocialIcon.tsx b/src/components/SocialIcon.tsx
@@ -51,7 +51,7 @@ export const SocialIcon = ({
   href: string
 }) => {
   return (
-    <SocialIconWrapper href={href}>
+    <SocialIconWrapper href={href} target="_blank">
       <StyledIcon key={href} $iconColor={color} as={Icon} />
       {ColoredIcon && <StyledColoredIcon as={ColoredIcon} />}
     </SocialIconWrapper>

diff --git a/src/transaction-flow/input/AdvancedEditor/AdvancedEditor-flow.tsx b/src/transaction-flow/input/AdvancedEditor/AdvancedEditor-flow.tsx
@@ -16,9 +16,8 @@ import type { TransactionDialogPassthrough } from '@app/transaction-flow/types'
 const Container = styled.form(({ theme }) => [
   css`
     width: 100%;
-    max-height: 60vh;
+    max-height: min(80vh, 600px);
     background: ${theme.colors.backgroundPrimary};
-    border-radius: ${theme.space['5']};
     overflow: hidden;
     display: flex;
     flex-direction: column;

diff --git a/src/transaction-flow/input/ProfileEditor/ProfileEditor-flow.tsx b/src/transaction-flow/input/ProfileEditor/ProfileEditor-flow.tsx
@@ -34,7 +34,7 @@ import { WrappedAvatarButton } from './WrappedAvatarButton'
 const Container = styled.form(({ theme }) => [
   css`
     width: 100%;
-    max-height: 600px;
+    max-height: min(80vh, 600px);
     display: flex;
     flex-direction: column;
     gap: ${theme.space['4']};