Convert all mutate to mutateAsync.

src/app/(main)/admin/users/UserAddForm.tsx

@@ -13,11 +13,11 @@ import { useMessages, useUpdateQuery } from '@/components/hooks';
 import { ROLES } from '@/lib/constants';
 
 export function UserAddForm({ onSave, onClose }) {
-  const { mutate, error, isPending } = useUpdateQuery(`/users`);
+  const { mutateAsync, error, isPending } = useUpdateQuery(`/users`);
   const { formatMessage, labels, getErrorMessage } = useMessages();
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         onSave(data);
         onClose();

src/app/(main)/admin/users/UserDeleteForm.tsx

@@ -13,11 +13,11 @@ export function UserDeleteForm({
   onClose?: () => void;
 }) {
   const { messages, labels, formatMessage } = useMessages();
-  const { mutate } = useDeleteQuery(`/users/${userId}`);
+  const { mutateAsync } = useDeleteQuery(`/users/${userId}`);
   const { touch } = useModified();
 
   const handleConfirm = async () => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: async () => {
         touch('users');
         touch(`users:${userId}`);

src/app/(main)/admin/users/[userId]/UserEditForm.tsx

@@ -16,10 +16,10 @@ export function UserEditForm({ userId, onSave }: { userId: string; onSave?: () =
   const user = useUser();
   const { user: login } = useLoginQuery();
 
-  const { mutate, error, toast, touch } = useUpdateQuery(`/users/${userId}`);
+  const { mutateAsync, error, toast, touch } = useUpdateQuery(`/users/${userId}`);
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch(`user:${user.id}`);

src/app/(main)/boards/BoardAddForm.tsx

@@ -13,10 +13,10 @@ export function BoardAddForm({
   onClose?: () => void;
 }) {
   const { formatMessage, labels, messages } = useMessages();
-  const { mutate, error, isPending } = useUpdateQuery('/websites', { teamId });
+  const { mutateAsync, error, isPending } = useUpdateQuery('/websites', { teamId });
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         onSave?.();
         onClose?.();

src/app/(main)/links/LinkDeleteButton.tsx

@@ -16,10 +16,10 @@ export function LinkDeleteButton({
   onSave?: () => void;
 }) {
   const { formatMessage, labels, getErrorMessage } = useMessages();
-  const { mutate, isPending, error, touch } = useDeleteQuery(`/links/${linkId}`);
+  const { mutateAsync, isPending, error, touch } = useDeleteQuery(`/links/${linkId}`);
 
-  const handleConfirm = (close: () => void) => {
+  const handleConfirm = async (close: () => void) => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: () => {
         touch('links');
         onSave?.();

src/app/(main)/links/LinkEditForm.tsx

@@ -33,7 +33,7 @@ export function LinkEditForm({
   onClose?: () => void;
 }) {
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
-  const { mutate, error, isPending, touch, toast } = useUpdateQuery(
+  const { mutateAsync, error, isPending, touch, toast } = useUpdateQuery(
     linkId ? `/links/${linkId}` : '/links',
     {
       id: linkId,
@@ -46,7 +46,7 @@ export function LinkEditForm({
   const [slug, setSlug] = useState(generateId());
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch('links');
@@ -139,9 +139,7 @@ export function LinkEditForm({
                   {formatMessage(labels.cancel)}
                 </Button>
               )}
-              <FormSubmitButton isDisabled={false} isLoading={isPending}>
+              <FormSubmitButton>{formatMessage(labels.save)}</FormSubmitButton>
-                {formatMessage(labels.save)}
-              </FormSubmitButton>
             </Row>
           </>
         );

src/app/(main)/pixels/PixelDeleteButton.tsx

@@ -14,11 +14,11 @@ export function PixelDeleteButton({
   onSave?: () => void;
 }) {
   const { formatMessage, labels, getErrorMessage } = useMessages();
-  const { mutate, isPending, error } = useDeleteQuery(`/pixels/${pixelId}`);
+  const { mutateAsync, isPending, error } = useDeleteQuery(`/pixels/${pixelId}`);
   const { touch } = useModified();
 
   const handleConfirm = (close: () => void) => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: () => {
         touch('pixels');
         onSave?.();

src/app/(main)/pixels/PixelEditForm.tsx

@@ -32,7 +32,7 @@ export function PixelEditForm({
   onClose?: () => void;
 }) {
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
-  const { mutate, error, isPending, touch, toast } = useUpdateQuery(
+  const { mutateAsync, error, isPending, touch, toast } = useUpdateQuery(
     pixelId ? `/pixels/${pixelId}` : '/pixels',
     {
       id: pixelId,
@@ -45,7 +45,7 @@ export function PixelEditForm({
   const [slug, setSlug] = useState(generateId());
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch('pixels');

src/app/(main)/settings/profile/PasswordEditForm.tsx

@@ -10,10 +10,10 @@ import { useMessages, useUpdateQuery } from '@/components/hooks';
 
 export function PasswordEditForm({ onSave, onClose }) {
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
-  const { mutate, error, isPending } = useUpdateQuery('/me/password');
+  const { mutateAsync, error, isPending } = useUpdateQuery('/me/password');
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         onSave();
         onClose();

src/app/(main)/teams/TeamAddForm.tsx

@@ -10,10 +10,10 @@ import {
 
 export function TeamAddForm({ onSave, onClose }: { onSave: () => void; onClose: () => void }) {
   const { formatMessage, labels, getErrorMessage } = useMessages();
-  const { mutate, error, isPending } = useUpdateQuery('/teams');
+  const { mutateAsync, error, isPending } = useUpdateQuery('/teams');
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         onSave?.();
         onClose?.();

src/app/(main)/teams/TeamJoinForm.tsx

@@ -10,10 +10,10 @@ import { useMessages, useUpdateQuery } from '@/components/hooks';
 
 export function TeamJoinForm({ onSave, onClose }: { onSave: () => void; onClose: () => void }) {
   const { formatMessage, labels, getErrorMessage } = useMessages();
-  const { mutate, error, isPending, touch } = useUpdateQuery('/teams/join');
+  const { mutateAsync, error, touch } = useUpdateQuery('/teams/join');
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         touch('teams:members');
         onSave?.();
@@ -33,9 +33,7 @@ export function TeamJoinForm({ onSave, onClose }: { onSave: () => void; onClose:
       </FormField>
       <FormButtons>
         <Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>
-        <FormSubmitButton variant="primary" isLoading={isPending} isDisabled={isPending}>
+        <FormSubmitButton variant="primary">{formatMessage(labels.join)}</FormSubmitButton>
-          {formatMessage(labels.join)}
-        </FormSubmitButton>
       </FormButtons>
     </Form>
   );

src/app/(main)/teams/TeamLeaveForm.tsx

@@ -15,11 +15,11 @@ export function TeamLeaveForm({
   onClose: () => void;
 }) {
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
-  const { mutate, error, isPending } = useDeleteQuery(`/teams/${teamId}/users/${userId}`);
+  const { mutateAsync, error, isPending } = useDeleteQuery(`/teams/${teamId}/users/${userId}`);
   const { touch } = useModified();
 
   const handleConfirm = async () => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: async () => {
         touch('teams:members');
         onSave();

src/app/(main)/teams/[teamId]/TeamDeleteForm.tsx

@@ -13,10 +13,10 @@ export function TeamDeleteForm({
   onClose?: () => void;
 }) {
   const { labels, formatMessage, getErrorMessage } = useMessages();
-  const { mutate, error, isPending, touch } = useDeleteQuery(`/teams/${teamId}`);
+  const { mutateAsync, error, isPending, touch } = useDeleteQuery(`/teams/${teamId}`);
 
   const handleConfirm = async () => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: async () => {
         touch('teams');
         onSave?.();

src/app/(main)/teams/[teamId]/TeamEditForm.tsx

@@ -25,10 +25,10 @@ export function TeamEditForm({
   const team = useTeam();
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
 
-  const { mutate, error, isPending, touch, toast } = useUpdateQuery(`/teams/${teamId}`);
+  const { mutateAsync, error, isPending, touch, toast } = useUpdateQuery(`/teams/${teamId}`);
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch('teams');

src/app/(main)/teams/[teamId]/TeamMemberEditForm.tsx

@@ -23,11 +23,11 @@ export function TeamMemberEditForm({
   onSave?: () => void;
   onClose?: () => void;
 }) {
-  const { mutate, error, isPending } = useUpdateQuery(`/teams/${teamId}/users/${userId}`);
+  const { mutateAsync, error, isPending } = useUpdateQuery(`/teams/${teamId}/users/${userId}`);
   const { formatMessage, labels, getErrorMessage } = useMessages();
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         onSave();
         onClose();

src/app/(main)/teams/[teamId]/TeamMemberRemoveButton.tsx

@@ -18,11 +18,11 @@ export function TeamMemberRemoveButton({
   onSave?: () => void;
 }) {
   const { formatMessage, labels } = useMessages();
-  const { mutate, isPending, error } = useDeleteQuery(`/teams/${teamId}/users/${userId}`);
+  const { mutateAsync, isPending, error } = useDeleteQuery(`/teams/${teamId}/users/${userId}`);
   const { touch } = useModified();
 
   const handleConfirm = (close: () => void) => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: () => {
         touch('teams:members');
         onSave?.();

src/app/(main)/teams/[teamId]/TeamWebsiteRemoveButton.tsx

@@ -1,13 +1,13 @@
 import { useDeleteQuery, useMessages } from '@/components/hooks';
 import { Icon, LoadingButton, Text } from '@umami/react-zen';
-import { Close } from '@/components/icons';
+import { X } from '@/components/icons';
 
 export function TeamWebsiteRemoveButton({ teamId, websiteId, onSave }) {
   const { formatMessage, labels } = useMessages();
-  const { mutate, isPending } = useDeleteQuery(`/teams/${teamId}/websites/${websiteId}`);
+  const { mutateAsync } = useDeleteQuery(`/teams/${teamId}/websites/${websiteId}`);
 
   const handleRemoveTeamMember = async () => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: () => {
         onSave();
       },
@@ -15,9 +15,9 @@ export function TeamWebsiteRemoveButton({ teamId, websiteId, onSave }) {
   };
 
   return (
-    <LoadingButton variant="quiet" onClick={() => handleRemoveTeamMember()} isLoading={isPending}>
+    <LoadingButton variant="quiet" onClick={() => handleRemoveTeamMember()}>
       <Icon>
-        <Close />
+        <X />
       </Icon>
       <Text>{formatMessage(labels.remove)}</Text>
     </LoadingButton>

src/app/(main)/websites/WebsiteAddForm.tsx

@@ -13,10 +13,10 @@ export function WebsiteAddForm({
   onClose?: () => void;
 }) {
   const { formatMessage, labels, messages } = useMessages();
-  const { mutate, error, isPending } = useUpdateQuery('/websites', { teamId });
+  const { mutateAsync, error, isPending } = useUpdateQuery('/websites', { teamId });
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         onSave?.();
         onClose?.();

src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx

@@ -33,12 +33,10 @@ export function FunnelEditForm({
 }) {
   const { formatMessage, labels } = useMessages();
   const { data } = useReportQuery(id);
-  const { mutate, error, isPending, touch } = useUpdateQuery(`/reports${id ? `/${id}` : ''}`);
+  const { mutateAsync, error, isPending, touch } = useUpdateQuery(`/reports${id ? `/${id}` : ''}`);
 
   const handleSubmit = async ({ name, ...parameters }) => {
-    //
+    await mutateAsync(
-
-    mutate(
       { ...data, id, name, type: 'funnel', websiteId, parameters },
       {
         onSuccess: async () => {

src/app/(main)/websites/[websiteId]/(reports)/goals/GoalEditForm.tsx

@@ -27,10 +27,10 @@ export function GoalEditForm({
 }) {
   const { formatMessage, labels } = useMessages();
   const { data } = useReportQuery(id);
-  const { mutate, error, isPending, touch } = useUpdateQuery(`/reports${id ? `/${id}` : ''}`);
+  const { mutateAsync, error, isPending, touch } = useUpdateQuery(`/reports${id ? `/${id}` : ''}`);
 
   const handleSubmit = async (formData: Record<string, any>) => {
-    mutate(
+    await mutateAsync(
       { ...formData, type: 'goal', websiteId },
       {
         onSuccess: async () => {

src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsx

@@ -17,12 +17,12 @@ export function CohortDeleteButton({
   onSave?: () => void;
 }) {
   const { formatMessage, labels } = useMessages();
-  const { mutate, isPending, error, touch } = useDeleteQuery(
+  const { mutateAsync, isPending, error, touch } = useDeleteQuery(
     `/websites/${websiteId}/segments/${cohortId}`,
   );
 
   const handleConfirm = (close: () => void) => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: () => {
         touch('cohorts');
         onSave?.();

src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx

@@ -33,7 +33,7 @@ export function CohortEditForm({
   const { data } = useWebsiteCohortQuery(websiteId, cohortId);
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
 
-  const { mutate, error, isPending, touch, toast } = useUpdateQuery(
+  const { mutateAsync, error, isPending, touch, toast } = useUpdateQuery(
     `/websites/${websiteId}/segments${cohortId ? `/${cohortId}` : ''}`,
     {
       type: 'cohort',
@@ -41,7 +41,7 @@ export function CohortEditForm({
   );
 
   const handleSubmit = async (formData: any) => {
-    mutate(formData, {
+    await mutateAsync(formData, {
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch('cohorts');

src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsx

@@ -17,12 +17,12 @@ export function SegmentDeleteButton({
   onSave?: () => void;
 }) {
   const { formatMessage, labels } = useMessages();
-  const { mutate, isPending, error, touch } = useDeleteQuery(
+  const { mutateAsync, isPending, error, touch } = useDeleteQuery(
     `/websites/${websiteId}/segments/${segmentId}`,
   );
 
   const handleConfirm = (close: () => void) => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: () => {
         touch('segments');
         onSave?.();

src/app/(main)/websites/[websiteId]/segments/SegmentEditForm.tsx

@@ -30,7 +30,7 @@ export function SegmentEditForm({
   const { data } = useWebsiteSegmentQuery(websiteId, segmentId);
   const { formatMessage, labels, getErrorMessage } = useMessages();
 
-  const { mutate, error, isPending, touch, toast } = useUpdateQuery(
+  const { mutateAsync, error, isPending, touch, toast } = useUpdateQuery(
     `/websites/${websiteId}/segments${segmentId ? `/${segmentId}` : ''}`,
     {
       type: 'segment',
@@ -38,7 +38,7 @@ export function SegmentEditForm({
   );
 
   const handleSubmit = async (formData: any) => {
-    mutate(formData, {
+    await mutateAsync(formData, {
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch('segments');

src/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm.tsx

@@ -13,10 +13,10 @@ export function WebsiteDeleteForm({
   onClose?: () => void;
 }) {
   const { formatMessage, labels } = useMessages();
-  const { mutate, isPending, error, touch } = useDeleteQuery(`/websites/${websiteId}`);
+  const { mutateAsync, isPending, error, touch } = useDeleteQuery(`/websites/${websiteId}`);
 
   const handleConfirm = async () => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: async () => {
         touch('websites');
         touch(`websites:${websiteId}`);

src/app/(main)/websites/[websiteId]/settings/WebsiteEditForm.tsx

@@ -5,10 +5,10 @@ import { DOMAIN_REGEX } from '@/lib/constants';
 export function WebsiteEditForm({ websiteId, onSave }: { websiteId: string; onSave?: () => void }) {
   const website = useWebsite();
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
-  const { mutate, error, touch, toast, isPending } = useUpdateQuery(`/websites/${websiteId}`);
+  const { mutateAsync, error, touch, toast } = useUpdateQuery(`/websites/${websiteId}`);
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch(`website:${website.id}`);
@@ -45,12 +45,7 @@ export function WebsiteEditForm({ websiteId, onSave }: { websiteId: string; onSa
         <TextField />
       </FormField>
       <FormButtons>
-        <FormSubmitButton
+        <FormSubmitButton data-test="button-submit" variant="primary">
-          data-test="button-submit"
-          variant="primary"
-          isLoading={isPending}
-          isDisabled={isPending}
-        >
           {formatMessage(labels.save)}
         </FormSubmitButton>
       </FormButtons>

src/app/(main)/websites/[websiteId]/settings/WebsiteResetForm.tsx

@@ -13,10 +13,10 @@ export function WebsiteResetForm({
   onClose?: () => void;
 }) {
   const { formatMessage, labels } = useMessages();
-  const { mutate, isPending, error } = useUpdateQuery(`/websites/${websiteId}/reset`);
+  const { mutateAsync, isPending, error } = useUpdateQuery(`/websites/${websiteId}/reset`);
 
   const handleConfirm = async () => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: async () => {
         onSave?.();
         onClose?.();

src/app/(main)/websites/[websiteId]/settings/WebsiteShareForm.tsx

@@ -25,7 +25,7 @@ export interface WebsiteShareFormProps {
 export function WebsiteShareForm({ websiteId, shareId, onSave, onClose }: WebsiteShareFormProps) {
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
   const [id, setId] = useState(shareId);
-  const { mutate, error, isPending, touch, toast } = useUpdateQuery(`/websites/${websiteId}`);
+  const { mutateAsync, error, touch, toast } = useUpdateQuery(`/websites/${websiteId}`);
 
   const url = `${window?.location.origin || ''}${process.env.basePath || ''}/share/${id}`;
 
@@ -37,11 +37,11 @@ export function WebsiteShareForm({ websiteId, shareId, onSave, onClose }: Websit
     setId(id ? null : generateId());
   };
 
-  const handleSave = () => {
+  const handleSave = async () => {
     const data = {
       shareId: id,
     };
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch(`website:${websiteId}`);
@@ -69,9 +69,7 @@ export function WebsiteShareForm({ websiteId, shareId, onSave, onClose }: Websit
           </Row>
           <Row alignItems="center" gap>
             {onClose && <Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>}
-            <FormSubmitButton isDisabled={false} isLoading={isPending}>
+            <FormSubmitButton isDisabled={false}>{formatMessage(labels.save)}</FormSubmitButton>
-              {formatMessage(labels.save)}
-            </FormSubmitButton>
           </Row>
         </FormButtons>
       </Column>

src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsx

@@ -32,7 +32,7 @@ export function WebsiteTransferForm({
   const website = useWebsite();
   const [teamId, setTeamId] = useState<string>(null);
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
-  const { mutate, error, isPending } = useUpdateQuery(`/websites/${websiteId}/transfer`);
+  const { mutateAsync, error, isPending } = useUpdateQuery(`/websites/${websiteId}/transfer`);
   const { data: teams, isLoading } = useUserTeamsQuery(user.id);
   const isTeamWebsite = !!website?.teamId;
 
@@ -45,7 +45,7 @@ export function WebsiteTransferForm({
     ) || [];
 
   const handleSubmit = async () => {
-    mutate(
+    await mutateAsync(
       {
         userId: website.teamId ? user.id : undefined,
         teamId: website.userId ? teamId : undefined,

src/app/login/LoginForm.tsx

@@ -18,10 +18,10 @@ import { LogoSvg } from '@/components/icons';
 export function LoginForm() {
   const { formatMessage, labels, getErrorMessage } = useMessages();
   const router = useRouter();
-  const { mutate, error, isPending } = useUpdateQuery('/auth/login');
+  const { mutateAsync, error } = useUpdateQuery('/auth/login');
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async ({ token, user }) => {
         setClientAuthToken(token);
         setUser(user);
@@ -55,13 +55,7 @@ export function LoginForm() {
           <PasswordField />
         </FormField>
         <FormButtons>
-          <FormSubmitButton
+          <FormSubmitButton data-test="button-submit" variant="primary" style={{ flex: 1 }}>
-            data-test="button-submit"
-            variant="primary"
-            isLoading={isPending}
-            isDisabled={isPending}
-            style={{ flex: 1 }}
-          >
             {formatMessage(labels.login)}
           </FormSubmitButton>
         </FormButtons>

src/components/input/ReportEditButton.tsx

@@ -31,7 +31,7 @@ export function ReportEditButton({
   const { formatMessage, labels, messages } = useMessages();
   const [showEdit, setShowEdit] = useState(false);
   const [showDelete, setShowDelete] = useState(false);
-  const { mutate, touch } = useDeleteQuery(`/reports/${id}`);
+  const { mutateAsync, touch } = useDeleteQuery(`/reports/${id}`);
 
   const handleAction = (id: any) => {
     if (id === 'edit') {
@@ -47,7 +47,7 @@ export function ReportEditButton({
   };
 
   const handleDelete = async () => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: async () => {
         touch(`reports:${type}`);
         setShowDelete(false);

src/components/input/SettingsButton.tsx

@@ -19,14 +19,14 @@ export function SettingsButton() {
   const { cloudMode } = useConfig();
 
   const handleAction = (id: Key) => {
-    if (id === 'settings') {
+    const url = `/${id}`;
-      if (cloudMode) {
+
-        window.location.href = `/settings`;
+    if (cloudMode) {
-        return;
+      window.location.href = url;
-      }
+      return;
     }
 
-    router.push(renderUrl(`/${id}`));
+    router.push(renderUrl(url));
   };
 
   return (