From 7308877e3eca5b9c5858b5b2c8df4b7a1f36eb03 Mon Sep 17 00:00:00 2001 From: Todd Kao Date: Fri, 17 Jan 2025 12:02:28 -0500 Subject: [PATCH 1/4] tunnel to /api/sentry --- packages/widget/src/index.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/widget/src/index.tsx b/packages/widget/src/index.tsx index f73b4a61..7bd60242 100644 --- a/packages/widget/src/index.tsx +++ b/packages/widget/src/index.tsx @@ -16,6 +16,7 @@ import { init({ dsn: "https://10ce608bdd1c68a13d3849d6b242333c@o4504768725909504.ingest.us.sentry.io/4508485201231872", + tunnel: "/api/sentry", defaultIntegrations: false, denyUrls: [/^https?:\/\/localhost:.*/], integrations: [ From ad9b1e66f09c614924b78a6ad4a1ea8b1152fff6 Mon Sep 17 00:00:00 2001 From: Todd Kao Date: Fri, 17 Jan 2025 12:04:10 -0500 Subject: [PATCH 2/4] changeset --- .changeset/eighty-rocks-melt.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/eighty-rocks-melt.md diff --git a/.changeset/eighty-rocks-melt.md b/.changeset/eighty-rocks-melt.md new file mode 100644 index 00000000..4aae98fd --- /dev/null +++ b/.changeset/eighty-rocks-melt.md @@ -0,0 +1,5 @@ +--- +"@skip-go/widget": patch +--- + +Proxy sentry requests to /api/sentry From 70d481116c5148c69ff915d7a7a7298c9c179423 Mon Sep 17 00:00:00 2001 From: Son La Pham Date: Fri, 17 Jan 2025 18:23:54 +0100 Subject: [PATCH 3/4] FRE-1393 Sp/settingswheel (#675) --- .changeset/neat-seals-breathe.md | 5 +++ packages/widget/src/components/Button.tsx | 3 +- packages/widget/src/icons/CogIcon.tsx | 33 ++++++++----------- .../SwapSettingsDrawer/SwapSettingsDrawer.tsx | 14 ++++---- .../src/pages/SwapPage/SwapPageFooter.tsx | 16 +++++---- 5 files changed, 37 insertions(+), 34 deletions(-) create mode 100644 .changeset/neat-seals-breathe.md diff --git a/.changeset/neat-seals-breathe.md b/.changeset/neat-seals-breathe.md new file mode 100644 index 00000000..15e2ca2e --- /dev/null +++ b/.changeset/neat-seals-breathe.md @@ -0,0 +1,5 @@ +--- +"@skip-go/widget": patch +--- + +Settings wheel size increased and opacity fix, plus settings bar css fixes diff --git a/packages/widget/src/components/Button.tsx b/packages/widget/src/components/Button.tsx index 70652a4e..d4717e4f 100644 --- a/packages/widget/src/components/Button.tsx +++ b/packages/widget/src/components/Button.tsx @@ -5,6 +5,7 @@ import { removeButtonStyles, SmallText } from "@/components/Typography"; export type GhostButtonProps = { secondary?: boolean; alwaysShowBackground?: boolean; + height?: number; } & FlexProps; export const GhostButton = styled(SmallText).attrs({ @@ -12,7 +13,7 @@ export const GhostButton = styled(SmallText).attrs({ })` ${removeButtonStyles}; line-height: 13px; - height: 30px; + height: ${({ height }) => height || 30}px; ${({ alwaysShowBackground, theme, secondary }) => { if (alwaysShowBackground) { diff --git a/packages/widget/src/icons/CogIcon.tsx b/packages/widget/src/icons/CogIcon.tsx index d2e64004..7d488c1d 100644 --- a/packages/widget/src/icons/CogIcon.tsx +++ b/packages/widget/src/icons/CogIcon.tsx @@ -5,24 +5,17 @@ type IconProps = { }; export const CogIcon = ({ color = "currentColor", ...props }: IconProps) => ( - - - - - - + + + + ); diff --git a/packages/widget/src/modals/SwapSettingsDrawer/SwapSettingsDrawer.tsx b/packages/widget/src/modals/SwapSettingsDrawer/SwapSettingsDrawer.tsx index 87c82473..b9fa35a8 100644 --- a/packages/widget/src/modals/SwapSettingsDrawer/SwapSettingsDrawer.tsx +++ b/packages/widget/src/modals/SwapSettingsDrawer/SwapSettingsDrawer.tsx @@ -119,16 +119,16 @@ export const SwapSettingsDrawer = createModal(() => { }, [transferOperations, route]); return ( - + - + Route {chainsRoute?.map((chain, index) => ( {chain?.prettyName} { {Boolean(route?.swapPriceImpactPercent) && ( - + Price Impact - + {route?.swapPriceImpactPercent}% @@ -152,7 +152,7 @@ export const SwapSettingsDrawer = createModal(() => { {fees.length > 0 && ( {fees.map(({ label, fee }, index) => ( - + {label} {fee.formattedAssetAmount} ({fee.formattedUsdAmount}) diff --git a/packages/widget/src/pages/SwapPage/SwapPageFooter.tsx b/packages/widget/src/pages/SwapPage/SwapPageFooter.tsx index df20021a..182fe908 100644 --- a/packages/widget/src/pages/SwapPage/SwapPageFooter.tsx +++ b/packages/widget/src/pages/SwapPage/SwapPageFooter.tsx @@ -72,7 +72,7 @@ export const SwapPageFooterItems = ({ {estimatedTime} - + {settingsChanged && } @@ -112,7 +112,7 @@ export const SwapPageFooterItems = ({ {estimatedTime} - + {settingsChanged && } @@ -160,7 +160,7 @@ export const SwapPageFooter = ({ } & SwapPageFooterItemsProps & React.ButtonHTMLAttributes) => { return ( - + theme.primary.text.normal}; border-radius: 50%; `; From 94a407d3ed351d912effbff2bb5bea5d3a823325 Mon Sep 17 00:00:00 2001 From: Todd Kao Date: Fri, 17 Jan 2025 12:28:01 -0500 Subject: [PATCH 4/4] update to use absolute url --- packages/widget/src/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/widget/src/index.tsx b/packages/widget/src/index.tsx index 7bd60242..5e576734 100644 --- a/packages/widget/src/index.tsx +++ b/packages/widget/src/index.tsx @@ -16,7 +16,7 @@ import { init({ dsn: "https://10ce608bdd1c68a13d3849d6b242333c@o4504768725909504.ingest.us.sentry.io/4508485201231872", - tunnel: "/api/sentry", + tunnel: "https://go.skip.build/api/sentry", defaultIntegrations: false, denyUrls: [/^https?:\/\/localhost:.*/], integrations: [