Merge branch 'RSSNext:dev' into dev

RSSNext · Oct 17, 2024 · a40cff3 · a40cff3
2 parents de58649 + 5b3f5ce
commit a40cff3
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/apps/renderer/src/components/ui/modal/stacked/custom-modal.tsx b/apps/renderer/src/components/ui/modal/stacked/custom-modal.tsx
@@ -102,7 +102,7 @@ export const DrawerModalLayout: FC<PropsWithChildren> = ({ children }) => {
         className={cn(
           "flex flex-col items-center overflow-hidden rounded-xl border bg-theme-background p-8 pb-0",
           "shadow-drawer-to-left w-[60ch] max-w-full",
-          "fixed inset-y-2 right-2",
+          "fixed bottom-0 right-2 safe-inset-top-4",
         )}
       >
         {children}

diff --git a/...derer/src/hooks/common/useProxySetting.ts → ...renderer/src/hooks/biz/useProxySetting.ts b/...derer/src/hooks/common/useProxySetting.ts → ...renderer/src/hooks/biz/useProxySetting.ts
diff --git a/apps/renderer/src/modules/settings/tabs/general.tsx b/apps/renderer/src/modules/settings/tabs/general.tsx
@@ -25,7 +25,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from "~/components/ui/select"
-import { useProxyValue, useSetProxy } from "~/hooks/common/useProxySetting"
+import { useProxyValue, useSetProxy } from "~/hooks/biz/useProxySetting"
 import { fallbackLanguage } from "~/i18n"
 import { initPostHog } from "~/initialize/posthog"
 import { tipcClient } from "~/lib/client"

diff --git a/apps/renderer/src/modules/settings/tabs/lists/modals.tsx b/apps/renderer/src/modules/settings/tabs/lists/modals.tsx
@@ -317,7 +317,7 @@ const RowRender = ({ feedId, listId }: { feedId: string; listId: string }) => {
       <TableCell size="sm">
         <a
           target="_blank"
-          href={UrlBuilder.shareList(feed.id)}
+          href={UrlBuilder.shareFeed(feed.id)}
           className="flex items-center gap-2 font-semibold"
         >
           {feed.siteUrl && <FeedIcon className="mr-0" siteUrl={feed.siteUrl} />}