From 72448740e8243cacf5c26e3c487962b4cd02a245 Mon Sep 17 00:00:00 2001 From: nenadV91 Date: Fri, 7 Jul 2023 16:45:57 +0200 Subject: [PATCH 1/3] fix(twap): hide learn more link --- .../containers/AdvancedOrdersWidget/index.tsx | 1 + src/modules/trade/pure/UnlockWidgetScreen/index.tsx | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx b/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx index 303b60b8ae..d608c2edc0 100644 --- a/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx +++ b/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx @@ -87,6 +87,7 @@ export function AdvancedOrdersWidget({ children }: { children: JSX.Element }) { bottomContent: children, lockScreen: isUnlocked ? undefined : ( @@ -51,9 +53,11 @@ export function UnlockWidgetScreen({ )} - - Learn more about {orderType} orders ↗ - + {showLink && ( + + Learn more about {orderType} orders ↗ + + )} {buttonText} From 7c69f9ebe6a1b4a876881dac4dc9bb7c80f6e0f9 Mon Sep 17 00:00:00 2001 From: fairlight <31534717+fairlighteth@users.noreply.github.com> Date: Mon, 10 Jul 2023 09:22:17 +0100 Subject: [PATCH 2/3] feat: update styles (#2817) --- .../advancedOrders/containers/AdvancedOrdersWidget/index.tsx | 2 +- src/modules/trade/pure/UnlockWidgetScreen/styled.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx b/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx index d608c2edc0..771fb834be 100644 --- a/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx +++ b/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx @@ -27,7 +27,7 @@ export const TWAP_BULLET_LIST_CONTENT: BulletListItem[] = [ ] const UNLOCK_SCREEN = { - title: 'Unlock the Power of Advanced Orders:', + title: 'Unlock the Power of Advanced Orders', subtitle: 'Begin with TWAP Today!', orderType: 'TWAP', buttonText: 'Unlock TWAP orders (BETA)', diff --git a/src/modules/trade/pure/UnlockWidgetScreen/styled.ts b/src/modules/trade/pure/UnlockWidgetScreen/styled.ts index 77b1b5dbbc..8572ebdf9b 100644 --- a/src/modules/trade/pure/UnlockWidgetScreen/styled.ts +++ b/src/modules/trade/pure/UnlockWidgetScreen/styled.ts @@ -14,15 +14,15 @@ export const TitleSection = styled.div` margin: 24px auto 42px; > h3 { - font-weight: 500; + font-weight: 400; font-size: inherit; margin: 0 0 4px; + color: ${({ theme }) => transparentize(0.2, theme.text1)}; } > strong { font-weight: 800; font-size: 22px; - color: ${({ theme }) => transparentize(0.3, theme.text1)}; margin: 0; } ` From 8f73ec37c79ef7b88fae04f998d51411522465d1 Mon Sep 17 00:00:00 2001 From: nenadV91 Date: Mon, 10 Jul 2023 10:57:54 +0200 Subject: [PATCH 3/3] fix(twap): pr comments --- .../containers/AdvancedOrdersWidget/index.tsx | 3 +-- .../limitOrders/containers/LimitOrdersWidget/index.tsx | 1 - src/modules/trade/pure/UnlockWidgetScreen/index.tsx | 6 ++---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx b/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx index 771fb834be..0076da2485 100644 --- a/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx +++ b/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx @@ -32,7 +32,7 @@ const UNLOCK_SCREEN = { orderType: 'TWAP', buttonText: 'Unlock TWAP orders (BETA)', // TODO: add actual link before deploy to PROD - buttonLink: 'http://google.com', + buttonLink: '', } export function AdvancedOrdersWidget({ children }: { children: JSX.Element }) { @@ -87,7 +87,6 @@ export function AdvancedOrdersWidget({ children }: { children: JSX.Element }) { bottomContent: children, lockScreen: isUnlocked ? undefined : ( partial fills support! ), - isNew: true, }, ] diff --git a/src/modules/trade/pure/UnlockWidgetScreen/index.tsx b/src/modules/trade/pure/UnlockWidgetScreen/index.tsx index c32d3178dd..77a0c34559 100644 --- a/src/modules/trade/pure/UnlockWidgetScreen/index.tsx +++ b/src/modules/trade/pure/UnlockWidgetScreen/index.tsx @@ -16,10 +16,9 @@ type UnlockWidgetProps = { handleUnlock: () => void title: string subtitle: string - buttonLink: string + buttonLink?: string orderType: string buttonText: string - showLink?: boolean } export function UnlockWidgetScreen({ @@ -30,7 +29,6 @@ export function UnlockWidgetScreen({ items, title, subtitle, - showLink = true, }: UnlockWidgetProps) { return ( @@ -53,7 +51,7 @@ export function UnlockWidgetScreen({ )} - {showLink && ( + {buttonLink && ( Learn more about {orderType} orders ↗