From 319a1dabb2b6a0560f5ebe68f3313dd3107db31f Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 22 Sep 2023 17:09:22 +0800 Subject: [PATCH 1/2] Early return from share-target --- .../_lightGray.colorset/Contents.json | 12 ++++++------ packages/web/public/sw.js | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apple/OmnivoreKit/Sources/Views/Colors/ThemeColors.xcassets/_lightGray.colorset/Contents.json b/apple/OmnivoreKit/Sources/Views/Colors/ThemeColors.xcassets/_lightGray.colorset/Contents.json index dea01a6a2..cf4b210e9 100644 --- a/apple/OmnivoreKit/Sources/Views/Colors/ThemeColors.xcassets/_lightGray.colorset/Contents.json +++ b/apple/OmnivoreKit/Sources/Views/Colors/ThemeColors.xcassets/_lightGray.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x68", - "green" : "0x69", - "red" : "0x69" + "blue" : "0x89", + "green" : "0x89", + "red" : "0x89" } }, "idiom" : "universal" @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x68", - "green" : "0x69", - "red" : "0x69" + "blue" : "0x89", + "green" : "0x89", + "red" : "0x89" } }, "idiom" : "universal" diff --git a/packages/web/public/sw.js b/packages/web/public/sw.js index 53f4dbd56..320c5f212 100644 --- a/packages/web/public/sw.js +++ b/packages/web/public/sw.js @@ -138,7 +138,7 @@ const requestUrl = new URL(request.url) if (requestUrl.pathname === '/share-target') { const shareRequest = handleShareTarget(request) - ev.respondWith(shareRequest) + return shareRequest } } From b4fa5df21f46714444b0477f9618810796cb13c1 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 22 Sep 2023 18:59:36 +0800 Subject: [PATCH 2/2] Trim RSS URLs before validating --- packages/web/pages/settings/feeds/add.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/web/pages/settings/feeds/add.tsx b/packages/web/pages/settings/feeds/add.tsx index f3f9ceb68..d1832952a 100644 --- a/packages/web/pages/settings/feeds/add.tsx +++ b/packages/web/pages/settings/feeds/add.tsx @@ -25,9 +25,8 @@ const Header = styled(Box, { export default function AddRssFeed(): JSX.Element { const router = useRouter() - const [errorMessage, setErrorMessage] = useState( - undefined - ) + const [errorMessage, setErrorMessage] = + useState(undefined) const [feedUrl, setFeedUrl] = useState('') const subscribe = useCallback(async () => { @@ -39,7 +38,7 @@ export default function AddRssFeed(): JSX.Element { let normailizedUrl: string // normalize the url try { - normailizedUrl = new URL(feedUrl).toString() + normailizedUrl = new URL(feedUrl.trim()).toString() } catch (e) { setErrorMessage('Please enter a valid feed URL') return