diff --git a/apps/mochi-web/components/settings/general/DefaultMessage.tsx b/apps/mochi-web/components/settings/general/DefaultMessage.tsx
index 1070c4f37..8de5af143 100644
--- a/apps/mochi-web/components/settings/general/DefaultMessage.tsx
+++ b/apps/mochi-web/components/settings/general/DefaultMessage.tsx
@@ -7,34 +7,25 @@ import {
 } from '@mochi-ui/core'
 import { EditLine, TrashBinLine } from '@mochi-ui/icons'
 import React from 'react'
-import {
-  Control,
-  Controller,
-  UseFormWatch,
-  useFieldArray,
-} from 'react-hook-form'
+import { Controller, useFieldArray, useFormContext } from 'react-hook-form'
 import { actionList } from '~constants/settings'
-import { GeneralFormValue } from './types'
+import { ResponseGeneralSettingData } from '~types/mochi-schema'
 import { MessageModal } from './MessageModal'
 
-interface Props {
-  control: Control<GeneralFormValue>
-  watch: UseFormWatch<GeneralFormValue>
-}
-
-export const DefaultMessage = ({ control, watch }: Props) => {
+export const DefaultMessage = () => {
+  const { control, watch } = useFormContext<ResponseGeneralSettingData>()
   const { fields, append, remove, update } = useFieldArray({
     control,
-    name: 'defaultMessage',
+    name: 'payment.default_message_settings',
   })
-  const enableDefaultMessage = watch('enableDefaultMessage')
+  const enableDefaultMessage = watch('payment.default_message_enable')
 
   return (
     <div className="flex flex-col w-full max-w-md space-y-2">
       <div className="flex items-center justify-between">
         <FormLabel>Default message</FormLabel>
         <Controller
-          name="enableDefaultMessage"
+          name="payment.default_message_enable"
           control={control}
           render={({ field: { value, onChange, ...rest } }) => (
             <Switch
@@ -48,7 +39,7 @@ export const DefaultMessage = ({ control, watch }: Props) => {
       {(enableDefaultMessage ? fields : []).map((each, index) => (
         <Controller
           key={each.id}
-          name={`defaultMessage.${index}`}
+          name={`payment.default_message_settings.${index}`}
           control={control}
           render={({ field }) => (
             <div className="flex items-center border rounded-md border-divider shadow-input">
diff --git a/apps/mochi-web/components/settings/general/GeneralPage.tsx b/apps/mochi-web/components/settings/general/GeneralPage.tsx
index 4cbfe713b..85904cdf0 100644
--- a/apps/mochi-web/components/settings/general/GeneralPage.tsx
+++ b/apps/mochi-web/components/settings/general/GeneralPage.tsx
@@ -1,12 +1,29 @@
-import { apiLogout } from '~constants/api'
+import { API, GET_PATHS, apiLogout } from '~constants/api'
 import { api } from '~constants/mochi'
-import { Button, Separator, Typography, useLoginWidget } from '@mochi-ui/core'
+import {
+  ActionBar,
+  ActionBarActionGroup,
+  ActionBarBody,
+  ActionBarCancelButton,
+  ActionBarConfirmButton,
+  ActionBarContent,
+  ActionBarDescription,
+  ActionBarIcon,
+  Button,
+  Separator,
+  Typography,
+  toast,
+  useLoginWidget,
+} from '@mochi-ui/core'
 import { useRouter } from 'next/router'
-import React from 'react'
+import React, { useCallback, useEffect } from 'react'
 import { FormProvider, useForm } from 'react-hook-form'
 import { ROUTES } from '~constants/routes'
-import { platformGroupList, targetGroupList } from '~constants/settings'
-import { GeneralFormValue } from './types'
+import { useFetchGeneralSettings } from '~hooks/settings/useFetchGeneralSettings'
+import {
+  ResponseGeneralSettingData,
+  ResponseUserGeneralSettingResponse,
+} from '~types/mochi-schema'
 import { MoneySource } from './MoneySource'
 import { ReceiverPlatform } from './ReceiverPlatform'
 import { TokenPriority } from './TokenPriority'
@@ -16,65 +33,93 @@ import { TransactionPrivacy } from './TransactionPrivacy'
 import { SocialAccountsPrivacy } from './SocialAccountsPrivacy'
 import { WalletsPrivacy } from './WalletsPrivacy'
 
+const SETTINGS_GENERAL_FORM_ID = 'settings-general-form'
+
 export const GeneralPage = () => {
-  const form = useForm<GeneralFormValue>({
+  const form = useForm<ResponseGeneralSettingData>({
     mode: 'all',
-    defaultValues: {
-      defaultMoneySource: 'mochi',
-      defaultReceiverPlatform: 'discord',
-      defaultTokenPriority: [{ id: '941f0fb1-00da-49dc-a538-5e81fc874cb4' }],
-      transactionPrivacy: {
-        general_target_group: targetGroupList[0].key,
-        general_platform_group: platformGroupList[0].key,
-        custom_settings: [],
-      },
-      socialAccountsPrivacy: {
-        general_target_group: targetGroupList[0].key,
-        general_platform_group: platformGroupList[0].key,
-        custom_settings: [],
-      },
-      walletsPrivacy: {
-        general_target_group: targetGroupList[0].key,
-        general_platform_group: platformGroupList[0].key,
-        custom_settings: [],
-      },
-    },
   })
-  const { handleSubmit, control, watch } = form
+  const {
+    handleSubmit,
+    reset,
+    formState: { isSubmitting, isDirty },
+  } = form
 
-  const { logout } = useLoginWidget()
+  const { profile, logout } = useLoginWidget()
   const { replace } = useRouter()
+  const { data: settings } = useFetchGeneralSettings(profile?.id)
+
+  const resetData = useCallback(
+    (data?: ResponseGeneralSettingData) => {
+      if (!data) return
+      reset({
+        ...data,
+        payment: {
+          ...data.payment,
+          prioritized_token: data.payment?.prioritized_token_ids?.map((id) => ({
+            id,
+          })),
+        },
+      })
+    },
+    [reset],
+  )
 
-  const onSubmit = (data: any) => {
-    alert(JSON.stringify(data))
+  const onUpdateSettings = (data: ResponseGeneralSettingData) => {
+    if (!profile?.id) return
+    const payload = {
+      payment: {
+        ...data.payment,
+        token_priorities:
+          data.payment?.prioritized_token?.map((each) => each.id) || [],
+      },
+      privacy: {
+        ...data.privacy,
+      },
+    }
+    return API.MOCHI.put(payload, GET_PATHS.UPDATE_GENERAL_SETTINGS(profile.id))
+      .json((r: ResponseUserGeneralSettingResponse) => {
+        resetData(r.data)
+      })
+      .catch((e) => {
+        const err = JSON.parse(e.message)
+        toast({
+          description: err.msg,
+          scheme: 'danger',
+        })
+      })
   }
 
-  return (
-    <>
-      <FormProvider {...form}>
-        <form onSubmit={handleSubmit(onSubmit)} />
-        <div className="space-y-4">
-          <Typography level="h6">Payment setting</Typography>
+  useEffect(() => {
+    resetData(settings)
+  }, [resetData, settings])
 
-          <div className="flex gap-4">
-            <MoneySource control={control} />
-            <ReceiverPlatform control={control} />
-          </div>
+  return (
+    <FormProvider {...form}>
+      <form
+        id={SETTINGS_GENERAL_FORM_ID}
+        onSubmit={handleSubmit(onUpdateSettings)}
+      />
+      <div className="space-y-4">
+        <Typography level="h6">Payment setting</Typography>
 
-          <TokenPriority {...{ control, watch }} />
-          <DefaultMessage {...{ control, watch }} />
-          <TransactionLimit {...{ control, watch }} />
+        <div className="flex gap-4">
+          <MoneySource />
+          <ReceiverPlatform />
+        </div>
 
-          <Separator className="w-full max-w-md" />
+        <TokenPriority />
+        <DefaultMessage />
+        <TransactionLimit />
 
-          <Typography level="h6">Privacy</Typography>
+        <Separator className="w-full max-w-md" />
 
-          <TransactionPrivacy {...{ control, watch }} />
-          <SocialAccountsPrivacy {...{ control, watch }} />
-          <WalletsPrivacy {...{ control, watch }} />
-        </div>
-      </FormProvider>
+        <Typography level="h6">Privacy</Typography>
 
+        <TransactionPrivacy />
+        <SocialAccountsPrivacy />
+        <WalletsPrivacy />
+      </div>
       <div className="mt-8">
         <Button
           variant="outline"
@@ -91,6 +136,41 @@ export const GeneralPage = () => {
           Log out
         </Button>
       </div>
-    </>
+      <div className="sticky bottom-0">
+        <ActionBar open={isDirty}>
+          <ActionBarContent
+            scheme="success"
+            outline
+            shadow
+            onOpenAutoFocus={(e) => e.preventDefault()}
+            anchorClassName="left-0 right-0 -mb-8"
+          >
+            <ActionBarIcon />
+            <ActionBarBody>
+              <ActionBarDescription>
+                Do you want to save these changes?
+              </ActionBarDescription>
+            </ActionBarBody>
+            <ActionBarActionGroup>
+              <ActionBarCancelButton
+                disabled={isSubmitting}
+                variant="link"
+                onClick={() => reset()}
+              >
+                Reset
+              </ActionBarCancelButton>
+              <ActionBarConfirmButton
+                loading={isSubmitting}
+                type="submit"
+                form={SETTINGS_GENERAL_FORM_ID}
+                className="min-w-[130px]"
+              >
+                Save changes
+              </ActionBarConfirmButton>
+            </ActionBarActionGroup>
+          </ActionBarContent>
+        </ActionBar>
+      </div>
+    </FormProvider>
   )
 }
diff --git a/apps/mochi-web/components/settings/general/MessageModal.tsx b/apps/mochi-web/components/settings/general/MessageModal.tsx
index cf395c03f..ed9f80d17 100644
--- a/apps/mochi-web/components/settings/general/MessageModal.tsx
+++ b/apps/mochi-web/components/settings/general/MessageModal.tsx
@@ -22,7 +22,7 @@ import { Controller, useForm } from 'react-hook-form'
 import { zodResolver } from '@hookform/resolvers/zod'
 import { z } from 'zod'
 import { actionList } from '~constants/settings'
-import { Message } from './types'
+import { ModelDefaultMessageSetting } from '~types/mochi-schema'
 
 const schema = z.object({
   action: z.string().min(1, 'This field is required'),
@@ -30,8 +30,8 @@ const schema = z.object({
 })
 
 interface Props {
-  defaultValues?: Message
-  onConfirm: (data: Message) => void
+  defaultValues?: ModelDefaultMessageSetting
+  onConfirm: (data: ModelDefaultMessageSetting) => void
   trigger: React.ReactNode
 }
 
@@ -41,12 +41,12 @@ export const MessageModal = ({
   trigger,
 }: Props) => {
   const [open, setOpen] = useState(false)
-  const { control, handleSubmit, reset } = useForm<Message>({
+  const { control, handleSubmit, reset } = useForm<ModelDefaultMessageSetting>({
     defaultValues,
     resolver: zodResolver(schema),
   })
 
-  const onSubmit = (data: Message) => {
+  const onSubmit = (data: ModelDefaultMessageSetting) => {
     setOpen(false)
     onConfirm(data)
   }
diff --git a/apps/mochi-web/components/settings/general/MoneySource.tsx b/apps/mochi-web/components/settings/general/MoneySource.tsx
index 380e6c431..0b10eb2da 100644
--- a/apps/mochi-web/components/settings/general/MoneySource.tsx
+++ b/apps/mochi-web/components/settings/general/MoneySource.tsx
@@ -1,3 +1,4 @@
+import { truncate } from '@dwarvesf/react-utils'
 import {
   Button,
   FormControl,
@@ -9,31 +10,54 @@ import {
   SelectSeparator,
   SelectTrigger,
   SelectValue,
+  useLoginWidget,
 } from '@mochi-ui/core'
 import { PlusLine } from '@mochi-ui/icons'
-import { Control, Controller } from 'react-hook-form'
-import { GeneralFormValue } from './types'
+import { Controller, useFormContext } from 'react-hook-form'
+import { ResponseGeneralSettingData } from '~types/mochi-schema'
+import { getPlatform } from '~utils/platform'
 
-interface Props {
-  control: Control<GeneralFormValue>
-}
+export const MoneySource = () => {
+  const { profile } = useLoginWidget()
+  const { control, setValue } = useFormContext<ResponseGeneralSettingData>()
 
-export const MoneySource = ({ control }: Props) => {
   return (
     <Controller
-      name="defaultMoneySource"
+      name="payment.default_money_source.platform_identifier"
       control={control}
       render={({ field, fieldState }) => (
         <FormControl error={!!fieldState.error} className="min-w-[160px]">
           <FormLabel>Default money source</FormLabel>
-          <Select {...field}>
+          <Select
+            {...field}
+            onChange={(value) => {
+              setValue(
+                'payment.default_money_source',
+                {
+                  platform_identifier: value,
+                  platform:
+                    profile?.associated_accounts?.find(
+                      (each) => each.platform_identifier === value,
+                    )?.platform || 'mochi',
+                },
+                { shouldDirty: true },
+              )
+            }}
+          >
             <SelectTrigger className="justify-between h-10 border border-divider">
-              <SelectValue placeholder="Mochi wallet" />
+              <SelectValue />
             </SelectTrigger>
             <SelectContent>
               <SelectItem value="mochi">Mochi wallet</SelectItem>
-              <SelectItem value="evm">EVM | 0xfsf...few</SelectItem>
-              <SelectItem value="sol">SOL | 0xfsf...few</SelectItem>
+              {profile?.associated_accounts?.map((each) => (
+                <SelectItem
+                  key={each.platform_identifier}
+                  value={each.platform_identifier}
+                >
+                  {getPlatform(each.platform).name} |{' '}
+                  {truncate(each.platform_identifier, 10, true)}
+                </SelectItem>
+              ))}
               <SelectSeparator />
               <Button variant="ghost" className="w-full pl-2 pr-2 h-9">
                 <PlusLine className="w-4 h-4" />
diff --git a/apps/mochi-web/components/settings/general/PrivacySetting.tsx b/apps/mochi-web/components/settings/general/PrivacySetting.tsx
index 0fcb1b563..c19e6d57f 100644
--- a/apps/mochi-web/components/settings/general/PrivacySetting.tsx
+++ b/apps/mochi-web/components/settings/general/PrivacySetting.tsx
@@ -9,51 +9,45 @@ import {
   SelectValue,
   Typography,
 } from '@mochi-ui/core'
-import React, { useEffect } from 'react'
-import {
-  Control,
-  Controller,
-  UseFormWatch,
-  useFieldArray,
-} from 'react-hook-form'
+import React from 'react'
+import { Controller, useFieldArray, useFormContext } from 'react-hook-form'
 import {
   platformGroupList,
   platformList,
   targetGroupList,
 } from '~constants/settings'
-import { GeneralFormValue } from './types'
+import { ResponseGeneralSettingData } from '~types/mochi-schema'
 
 interface Props {
-  name: 'transactionPrivacy' | 'socialAccountsPrivacy' | 'walletsPrivacy'
-  control: Control<GeneralFormValue>
-  watch: UseFormWatch<GeneralFormValue>
+  name: 'tx' | 'social_accounts' | 'wallets'
 }
 
-export const PrivacySetting = ({ name, control, watch }: Props) => {
-  const isCustom = watch(`${name}.general_platform_group`) === 'custom'
+export const PrivacySetting = ({ name }: Props) => {
+  const { control, watch } = useFormContext<ResponseGeneralSettingData>()
+  const isCustom = watch(`privacy.${name}.general_platform_group`) === 'custom'
   const { fields, replace } = useFieldArray({
     control,
-    name: `${name}.custom_settings`,
+    name: `privacy.${name}.custom_settings`,
   })
 
-  useEffect(() => {
-    if (!isCustom) {
+  const onPlatformGroupChange = (value: string) => {
+    if (value === 'all') {
       replace([])
-      return
+    } else {
+      replace(
+        platformList.map((each) => ({
+          target_group: targetGroupList[0].key,
+          platform: each.key,
+        })),
+      )
     }
-    replace(
-      platformList.map((each) => ({
-        target_group: targetGroupList[0].key,
-        platform: each.key,
-      })),
-    )
-  }, [isCustom, replace])
+  }
 
   return (
     <>
       <div className="flex flex-wrap items-center gap-2">
         <Controller
-          name={`${name}.general_target_group`}
+          name={`privacy.${name}.general_target_group`}
           control={control}
           render={({ field, fieldState }) => (
             <FormControl
@@ -78,14 +72,20 @@ export const PrivacySetting = ({ name, control, watch }: Props) => {
         />
         <Typography level="p5">on</Typography>
         <Controller
-          name={`${name}.general_platform_group`}
+          name={`privacy.${name}.general_platform_group`}
           control={control}
           render={({ field, fieldState }) => (
             <FormControl
               error={!!fieldState.error}
               className="flex-1 min-w-[215px]"
             >
-              <Select {...field}>
+              <Select
+                {...field}
+                onChange={(value) => {
+                  field.onChange(value)
+                  onPlatformGroupChange(value)
+                }}
+              >
                 <SelectTrigger className="justify-between h-10 border border-divider">
                   <SelectValue />
                 </SelectTrigger>
@@ -107,7 +107,7 @@ export const PrivacySetting = ({ name, control, watch }: Props) => {
           {fields.map((each, index) => (
             <div key={each.id} className="flex flex-wrap items-center gap-2">
               <Controller
-                name={`${name}.custom_settings.${index}.target_group`}
+                name={`privacy.${name}.custom_settings.${index}.target_group`}
                 control={control}
                 render={({ field, fieldState }) => (
                   <FormControl
diff --git a/apps/mochi-web/components/settings/general/ReceiverPlatform.tsx b/apps/mochi-web/components/settings/general/ReceiverPlatform.tsx
index de2dfa156..07c610a8f 100644
--- a/apps/mochi-web/components/settings/general/ReceiverPlatform.tsx
+++ b/apps/mochi-web/components/settings/general/ReceiverPlatform.tsx
@@ -8,17 +8,15 @@ import {
   SelectTrigger,
   SelectValue,
 } from '@mochi-ui/core'
-import { Control, Controller } from 'react-hook-form'
-import { GeneralFormValue } from './types'
+import { Controller, useFormContext } from 'react-hook-form'
+import { ResponseGeneralSettingData } from '~types/mochi-schema'
 
-interface Props {
-  control: Control<GeneralFormValue>
-}
+export const ReceiverPlatform = () => {
+  const { control } = useFormContext<ResponseGeneralSettingData>()
 
-export const ReceiverPlatform = ({ control }: Props) => {
   return (
     <Controller
-      name="defaultReceiverPlatform"
+      name="payment.default_receiver_platform"
       control={control}
       render={({ field, fieldState }) => (
         <FormControl error={!!fieldState.error} className="min-w-[160px]">
diff --git a/apps/mochi-web/components/settings/general/SocialAccountsPrivacy.tsx b/apps/mochi-web/components/settings/general/SocialAccountsPrivacy.tsx
index a23dd6b47..c200dc021 100644
--- a/apps/mochi-web/components/settings/general/SocialAccountsPrivacy.tsx
+++ b/apps/mochi-web/components/settings/general/SocialAccountsPrivacy.tsx
@@ -1,19 +1,12 @@
 import { FormLabel } from '@mochi-ui/core'
 import React from 'react'
-import { Control, UseFormWatch } from 'react-hook-form'
-import { GeneralFormValue } from './types'
 import { PrivacySetting } from './PrivacySetting'
 
-interface Props {
-  control: Control<GeneralFormValue>
-  watch: UseFormWatch<GeneralFormValue>
-}
-
-export const SocialAccountsPrivacy = ({ control, watch }: Props) => {
+export const SocialAccountsPrivacy = () => {
   return (
     <div className="flex flex-col w-full max-w-md space-y-2">
       <FormLabel>Social Accounts</FormLabel>
-      <PrivacySetting {...{ control, watch }} name="socialAccountsPrivacy" />
+      <PrivacySetting name="social_accounts" />
     </div>
   )
 }
diff --git a/apps/mochi-web/components/settings/general/TokenPriority.tsx b/apps/mochi-web/components/settings/general/TokenPriority.tsx
index 8726bdbfd..4d4ee158d 100644
--- a/apps/mochi-web/components/settings/general/TokenPriority.tsx
+++ b/apps/mochi-web/components/settings/general/TokenPriority.tsx
@@ -6,121 +6,48 @@ import {
   DropdownMenuTrigger,
   FormLabel,
   IconButton,
+  List,
   TextFieldInput,
   Typography,
 } from '@mochi-ui/core'
-import { ChevronDownLine, MenuSolid, TrashBinLine } from '@mochi-ui/icons'
+import { Bag, ChevronDownLine, MenuSolid, TrashBinLine } from '@mochi-ui/icons'
 import React from 'react'
-import {
-  Control,
-  Controller,
-  UseFormWatch,
-  useFieldArray,
-} from 'react-hook-form'
+import { Controller, useFieldArray, useFormContext } from 'react-hook-form'
 import { TokenAvatar } from '~cpn/TokenAvatar'
-import { GeneralFormValue } from './types'
-
-const tokenList = [
-  {
-    id: '941f0fb1-00da-49dc-a538-5e81fc874cb4',
-    name: 'Icy',
-    symbol: 'ICY',
-    decimal: 18,
-    chain_id: '137',
-    native: false,
-    address: '0x8D57d71B02d71e1e449a0E459DE40473Eb8f4a90',
-    icon: 'https://cdn.discordapp.com/emojis/1049620715374133288.webp?size=240&quality=lossless',
-    coin_gecko_id: 'icy',
-    price: 1.5,
-    chain: {
-      id: '7303f2f8-b6d9-454d-aa92-880569fa5295',
-      chain_id: '137',
-      name: 'Polygon Mainnet',
-      symbol: 'MATIC',
-      rpc: 'https://polygon.llamarpc.com',
-      explorer: 'https://polygonscan.com',
-      icon: 'https://cdn.discordapp.com/emojis/928216430535671818.png?size=240&quality=lossless',
-      type: 'evm',
-    },
-  },
-  {
-    id: 'd0bf0f44-e951-4f81-8643-3e6b9b0841d8',
-    name: 'Ethereum',
-    symbol: 'ETH',
-    decimal: 18,
-    chain_id: '42161',
-    native: true,
-    address: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
-    icon: '',
-    coin_gecko_id: 'ethereum',
-    price: 2129.75,
-    chain: {
-      id: 'b1065911-fd00-4424-bc7c-03868e6d1ed1',
-      chain_id: '42161',
-      name: 'Arbitrum',
-      symbol: 'ARB',
-      rpc: 'https://arbitrum.llamarpc.com',
-      explorer: 'https://arbiscan.io',
-      icon: '',
-      type: 'evm',
-    },
-  },
-  {
-    id: '61388b7c-5505-4fdf-8084-077422369a93',
-    name: 'Fantom',
-    symbol: 'FTM',
-    decimal: 18,
-    chain_id: '250',
-    native: true,
-    address: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
-    icon: '',
-    coin_gecko_id: 'fantom',
-    price: 0.380276,
-    chain: {
-      id: '7303f2f8-b6d9-454d-aa92-880569fa5296',
-      chain_id: '250',
-      name: 'Fantom Opera',
-      symbol: 'FTM',
-      rpc: 'https://rpc.ftm.tools',
-      explorer: 'https://ftmscan.com',
-      icon: 'https://cdn.discordapp.com/emojis/928216448902508564.png?size=240&quality=lossless',
-      type: 'evm',
-    },
-  },
-]
-
-interface Props {
-  control: Control<GeneralFormValue>
-  watch: UseFormWatch<GeneralFormValue>
-}
+import { useWalletStore } from '~store'
+import { ResponseGeneralSettingData } from '~types/mochi-schema'
 
-export const TokenPriority = ({ control, watch }: Props) => {
+export const TokenPriority = () => {
+  const { control, watch } = useFormContext<ResponseGeneralSettingData>()
   const { fields, append, remove } = useFieldArray({
     control,
-    name: 'defaultTokenPriority',
+    name: 'payment.prioritized_token',
   })
   const [tokenQuery, setTokenQuery] = React.useState('')
+  const { wallets } = useWalletStore()
+  const balances = wallets.flatMap((w) => w.balances)
 
-  const currentTokenPriority = watch('defaultTokenPriority')
-  const currentTokenPriorityIds = currentTokenPriority.map((token) => token.id)
+  const currentTokenPriorityIds =
+    watch('payment.prioritized_token')?.map((each) => each.id) || []
+  const tokenList = balances.flatMap((each) => each.token || [])
   const filteredTokenList = tokenList
     .filter((token) => !currentTokenPriorityIds.includes(token.id))
-    .filter((token) =>
-      token.symbol.toLowerCase().includes(tokenQuery.toLowerCase()),
+    .filter(
+      (token) => token.symbol?.toLowerCase().includes(tokenQuery.toLowerCase()),
     )
 
   return (
-    <div className="flex flex-col space-y-2 w-full max-w-md">
+    <div className="flex flex-col w-full max-w-md space-y-2">
       <FormLabel>Default token prioirty</FormLabel>
       {fields.map((each, index) => (
         <Controller
           key={each.id}
-          name={`defaultTokenPriority.${index}`}
+          name={`payment.prioritized_token.${index}`}
           control={control}
           render={({ field }) => {
-            const token = tokenList.find((token) => token.id === field.value.id)
+            const token = tokenList.find((t) => t.id === field.value.id)
             return (
-              <div className="flex items-center h-10 rounded-md border border-divider shadow-input">
+              <div className="flex items-center h-10 border rounded-md border-divider shadow-input">
                 <IconButton
                   label="Move"
                   variant="ghost"
@@ -151,7 +78,7 @@ export const TokenPriority = ({ control, watch }: Props) => {
       ))}
       <DropdownMenu onOpenChange={() => setTokenQuery('')}>
         <DropdownMenuTrigger asChild>
-          <Button color="white" className="pr-2 pl-2 w-fit">
+          <Button color="white" className="pl-2 pr-2 w-fit">
             Add a default token
             <ChevronDownLine />
           </Button>
@@ -162,15 +89,26 @@ export const TokenPriority = ({ control, watch }: Props) => {
             value={tokenQuery}
             onChange={(e) => setTokenQuery(e.target.value)}
           />
-          {filteredTokenList.map((token) => (
-            <DropdownMenuItem
-              key={token.id}
-              textValue=""
-              onClick={() => append({ id: token.id })}
-            >
-              {token.symbol}
-            </DropdownMenuItem>
-          ))}
+          <List
+            rootClassName="max-h-[300px] overflow-y-auto"
+            data={filteredTokenList}
+            renderItem={(item) => (
+              <DropdownMenuItem
+                textValue=""
+                onClick={() => append({ ...item, chain: undefined })}
+              >
+                {item.symbol}
+              </DropdownMenuItem>
+            )}
+            ListEmpty={
+              <div className="flex flex-col items-center justify-center py-10">
+                <Bag className="w-14 h-14 text-neutral-500" />
+                <Typography level="h7" color="textSecondary">
+                  No tokens
+                </Typography>
+              </div>
+            }
+          />
         </DropdownMenuContent>
       </DropdownMenu>
     </div>
diff --git a/apps/mochi-web/components/settings/general/TransactionLimit.tsx b/apps/mochi-web/components/settings/general/TransactionLimit.tsx
index 978a9dae1..3d9b93e85 100644
--- a/apps/mochi-web/components/settings/general/TransactionLimit.tsx
+++ b/apps/mochi-web/components/settings/general/TransactionLimit.tsx
@@ -7,104 +7,26 @@ import {
 } from '@mochi-ui/core'
 import { EditLine, TrashBinLine } from '@mochi-ui/icons'
 import React from 'react'
-import {
-  Control,
-  Controller,
-  UseFormWatch,
-  useFieldArray,
-} from 'react-hook-form'
+import { Controller, useFieldArray, useFormContext } from 'react-hook-form'
 import { actionList } from '~constants/settings'
 import { utils as mochiUtils } from '@consolelabs/mochi-ui'
-import { GeneralFormValue } from './types'
+import { ResponseGeneralSettingData } from '~types/mochi-schema'
 import { TransactionLimitModal } from './TransactionLimitModal'
 
-const tokenList = [
-  {
-    id: '941f0fb1-00da-49dc-a538-5e81fc874cb4',
-    name: 'Icy',
-    symbol: 'ICY',
-    decimal: 18,
-    chain_id: '137',
-    native: false,
-    address: '0x8D57d71B02d71e1e449a0E459DE40473Eb8f4a90',
-    icon: 'https://cdn.discordapp.com/emojis/1049620715374133288.webp?size=240&quality=lossless',
-    coin_gecko_id: 'icy',
-    price: 1.5,
-    chain: {
-      id: '7303f2f8-b6d9-454d-aa92-880569fa5295',
-      chain_id: '137',
-      name: 'Polygon Mainnet',
-      symbol: 'MATIC',
-      rpc: 'https://polygon.llamarpc.com',
-      explorer: 'https://polygonscan.com',
-      icon: 'https://cdn.discordapp.com/emojis/928216430535671818.png?size=240&quality=lossless',
-      type: 'evm',
-    },
-  },
-  {
-    id: 'd0bf0f44-e951-4f81-8643-3e6b9b0841d8',
-    name: 'Ethereum',
-    symbol: 'ETH',
-    decimal: 18,
-    chain_id: '42161',
-    native: true,
-    address: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
-    icon: '',
-    coin_gecko_id: 'ethereum',
-    price: 2129.75,
-    chain: {
-      id: 'b1065911-fd00-4424-bc7c-03868e6d1ed1',
-      chain_id: '42161',
-      name: 'Arbitrum',
-      symbol: 'ARB',
-      rpc: 'https://arbitrum.llamarpc.com',
-      explorer: 'https://arbiscan.io',
-      icon: '',
-      type: 'evm',
-    },
-  },
-  {
-    id: '61388b7c-5505-4fdf-8084-077422369a93',
-    name: 'Fantom',
-    symbol: 'FTM',
-    decimal: 18,
-    chain_id: '250',
-    native: true,
-    address: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
-    icon: '',
-    coin_gecko_id: 'fantom',
-    price: 0.380276,
-    chain: {
-      id: '7303f2f8-b6d9-454d-aa92-880569fa5296',
-      chain_id: '250',
-      name: 'Fantom Opera',
-      symbol: 'FTM',
-      rpc: 'https://rpc.ftm.tools',
-      explorer: 'https://ftmscan.com',
-      icon: 'https://cdn.discordapp.com/emojis/928216448902508564.png?size=240&quality=lossless',
-      type: 'evm',
-    },
-  },
-]
-
-interface Props {
-  control: Control<GeneralFormValue>
-  watch: UseFormWatch<GeneralFormValue>
-}
-
-export const TransactionLimit = ({ control, watch }: Props) => {
+export const TransactionLimit = () => {
+  const { control, watch } = useFormContext<ResponseGeneralSettingData>()
   const { fields, append, remove, update } = useFieldArray({
     control,
-    name: 'transactionLimit',
+    name: 'payment.tx_limit_settings',
   })
-  const enableTransactionLimit = watch('enableTransactionLimit')
+  const enableTransactionLimit = watch('payment.tx_limit_enable')
 
   return (
     <div className="flex flex-col w-full max-w-md space-y-2">
       <div className="flex items-center justify-between">
         <FormLabel>Set the limit for transaction</FormLabel>
         <Controller
-          name="enableTransactionLimit"
+          name="payment.tx_limit_enable"
           control={control}
           render={({ field: { value, onChange, ...rest } }) => (
             <Switch
@@ -118,74 +40,52 @@ export const TransactionLimit = ({ control, watch }: Props) => {
       {(enableTransactionLimit ? fields : []).map((each, index) => (
         <Controller
           key={each.id}
-          name={`transactionLimit.${index}`}
+          name={`payment.tx_limit_settings.${index}`}
           control={control}
-          render={({ field }) => {
-            const minToken = tokenList.find(
-              (token) => token.id === field.value.minToken,
-            )
-            const minAmount = mochiUtils.formatDigit({
-              value: field.value.minAmount,
-            })
-            const minUsd =
-              Number(field.value.minAmount) * (minToken?.price || 0)
-            const minUsdValue = mochiUtils.formatUsdDigit(minUsd)
-            const maxToken = tokenList.find(
-              (token) => token.id === field.value.maxToken,
-            )
-            const maxAmount = mochiUtils.formatDigit({
-              value: field.value.maxAmount,
-            })
-            const maxUsd =
-              Number(field.value.maxAmount) * (maxToken?.price || 0)
-            const maxUsdValue = mochiUtils.formatUsdDigit(maxUsd)
-            return (
-              <div className="flex items-center border rounded-md border-divider shadow-input">
-                <div className="flex-1 px-4 py-2 overflow-hidden">
-                  <Typography level="h8">
-                    {
-                      actionList.find(
-                        (action) => action.key === field.value.action,
-                      )?.label
-                    }
+          render={({ field }) => (
+            <div className="flex items-center border rounded-md border-divider shadow-input">
+              <div className="flex-1 px-4 py-2 overflow-hidden">
+                <Typography level="h8">
+                  {
+                    actionList.find(
+                      (action) => action.key === field.value.action,
+                    )?.label
+                  }
+                </Typography>
+                <div className="flex flex-wrap">
+                  <Typography level="p5" className="mr-2">
+                    Minimum value: $
+                    {mochiUtils.formatDigit({ value: field.value.min || 0 })},
+                  </Typography>
+                  <Typography level="p5">
+                    Maximum value: $
+                    {mochiUtils.formatDigit({ value: field.value.max || 0 })}
                   </Typography>
-                  <div className="flex flex-wrap">
-                    <Typography level="p5" className="mr-2">
-                      Minimum value: {minAmount} {minToken?.symbol} (&#8776;{' '}
-                      {minUsdValue}),
-                    </Typography>
-                    <Typography level="p5">
-                      Maximum value: {maxAmount} {maxToken?.symbol} (&#8776;{' '}
-                      {maxUsdValue})
-                    </Typography>
-                  </div>
                 </div>
-                <TransactionLimitModal
-                  tokenList={tokenList}
-                  defaultValues={field.value}
-                  onConfirm={(data) => update(index, data)}
-                  trigger={
-                    <IconButton label="Edit" variant="ghost" color="white">
-                      <EditLine className="w-5 h-5" />
-                    </IconButton>
-                  }
-                />
-                <IconButton
-                  label="Delete"
-                  variant="ghost"
-                  color="white"
-                  onClick={() => remove(index)}
-                >
-                  <TrashBinLine className="w-5 h-5 text-danger-solid" />
-                </IconButton>
               </div>
-            )
-          }}
+              <TransactionLimitModal
+                defaultValues={field.value}
+                onConfirm={(data) => update(index, data)}
+                trigger={
+                  <IconButton label="Edit" variant="ghost" color="white">
+                    <EditLine className="w-5 h-5" />
+                  </IconButton>
+                }
+              />
+              <IconButton
+                label="Delete"
+                variant="ghost"
+                color="white"
+                onClick={() => remove(index)}
+              >
+                <TrashBinLine className="w-5 h-5 text-danger-solid" />
+              </IconButton>
+            </div>
+          )}
         />
       ))}
       {!!enableTransactionLimit && (
         <TransactionLimitModal
-          tokenList={tokenList}
           onConfirm={(data) => append(data)}
           trigger={
             <Button color="white" className="w-fit">
diff --git a/apps/mochi-web/components/settings/general/TransactionLimitModal.tsx b/apps/mochi-web/components/settings/general/TransactionLimitModal.tsx
index a6aaa9a4c..4cf5181a1 100644
--- a/apps/mochi-web/components/settings/general/TransactionLimitModal.tsx
+++ b/apps/mochi-web/components/settings/general/TransactionLimitModal.tsx
@@ -23,66 +23,49 @@ import { Controller, useForm } from 'react-hook-form'
 import { zodResolver } from '@hookform/resolvers/zod'
 import { z } from 'zod'
 import { actionList } from '~constants/settings'
-import { ModelToken } from '~types/mochi-pay-schema'
-import { TokenAvatar } from '~cpn/TokenAvatar'
-import { TransactionLimit } from './types'
+import { ModelTxLimitSetting } from '~types/mochi-schema'
 
 const schema = z
   .object({
-    action: z.string().min(1, 'This field is required'),
-    minAmount: z
-      .string()
-      .min(1, 'Amount is required')
-      .refine((value) => !Number.isNaN(Number(value)), {
-        path: ['minAmount'],
-        message: 'Amount must be a number',
-      }),
-    minToken: z.string().min(1, 'Token is required'),
-    maxAmount: z
-      .string()
-      .min(1, 'Amount is required')
-      .refine((value) => !Number.isNaN(Number(value)), {
-        path: ['maxAmount'],
-        message: 'Amount must be a number',
-      }),
-    maxToken: z.string().min(1, 'Token is required'),
+    action: z
+      .string({ required_error: 'This field is required' })
+      .min(1, 'This field is required'),
+    min: z
+      .number({
+        required_error: 'Amount is required',
+        invalid_type_error: 'Amount must be a number',
+      })
+      .min(0, 'Amount must be greater than 0'),
+    max: z
+      .number({
+        required_error: 'Amount is required',
+        invalid_type_error: 'Amount must be a number',
+      })
+      .min(0, 'Amount must be greater than 0'),
   })
-  .refine((data) => Number(data.maxAmount) > Number(data.minAmount), {
-    path: ['maxAmount'],
+  .refine((data) => Number(data.max) > Number(data.min), {
+    path: ['max'],
     message: 'Max amount must be greater than min amount',
   })
 
 interface Props {
-  defaultValues?: TransactionLimit
-  onConfirm: (data: TransactionLimit) => void
+  defaultValues?: ModelTxLimitSetting
+  onConfirm: (data: ModelTxLimitSetting) => void
   trigger: React.ReactNode
-  tokenList: ModelToken[]
 }
 
 export const TransactionLimitModal = ({
-  defaultValues = {
-    action: '',
-    minAmount: '',
-    maxAmount: '',
-    minToken: '',
-    maxToken: '',
-  },
+  defaultValues = {},
   onConfirm,
   trigger,
-  tokenList,
 }: Props) => {
   const [open, setOpen] = useState(false)
-  const {
-    control,
-    handleSubmit,
-    reset,
-    formState: { errors },
-  } = useForm<TransactionLimit>({
+  const { control, handleSubmit, reset } = useForm<ModelTxLimitSetting>({
     defaultValues,
     resolver: zodResolver(schema),
   })
 
-  const onSubmit = (data: TransactionLimit) => {
+  const onSubmit = (data: ModelTxLimitSetting) => {
     setOpen(false)
     onConfirm(data)
   }
@@ -110,7 +93,7 @@ export const TransactionLimitModal = ({
               name="action"
               control={control}
               render={({ field, fieldState }) => (
-                <FormControl error={!!fieldState.error} className="mt-8 w-full">
+                <FormControl error={!!fieldState.error} className="w-full mt-8">
                   <FormLabel>Action</FormLabel>
                   <Select {...field}>
                     <SelectTrigger className="justify-between h-10 border border-divider">
@@ -131,126 +114,60 @@ export const TransactionLimitModal = ({
               )}
             />
             <Controller
-              name="minAmount"
+              name="min"
               control={control}
-              render={({ field }) => (
-                <FormControl
-                  error={
-                    !!errors.minAmount?.message || !!errors.minToken?.message
-                  }
-                  className="mt-4 w-full"
-                >
+              render={({ field, fieldState: { error } }) => (
+                <FormControl error={!!error?.message} className="w-full mt-4">
                   <FormLabel>Minimun value</FormLabel>
-                  <TextFieldRoot className="pr-0">
+                  <TextFieldRoot>
                     <TextFieldInput
                       {...field}
                       placeholder="Enter amount"
                       autoComplete="off"
                       type="number"
-                      min={0}
                       step="any"
+                      onChange={(e) =>
+                        field.onChange(
+                          e.target.value ? Number(e.target.value) : '',
+                        )
+                      }
                     />
                     <TextFieldDecorator>
-                      <Controller
-                        name="minToken"
-                        control={control}
-                        render={({ field, fieldState }) => (
-                          <FormControl error={!!fieldState.error}>
-                            <Select {...field}>
-                              <SelectTrigger className="justify-between h-10 border-l min-w-[140px] border-divider">
-                                <SelectValue placeholder="Choose token" />
-                              </SelectTrigger>
-                              <SelectContent>
-                                {tokenList.map((each) => (
-                                  <SelectItem
-                                    key={each.id}
-                                    value={String(each.id)}
-                                  >
-                                    <div className="flex items-center space-x-2">
-                                      <TokenAvatar
-                                        src={each.icon || ''}
-                                        name={each.symbol || ''}
-                                      />
-                                      <Typography level="p5">
-                                        {each.symbol}
-                                      </Typography>
-                                    </div>
-                                  </SelectItem>
-                                ))}
-                              </SelectContent>
-                            </Select>
-                          </FormControl>
-                        )}
-                      />
+                      <Typography level="p5">USD</Typography>
                     </TextFieldDecorator>
                   </TextFieldRoot>
-                  <FormErrorMessage>
-                    {errors.minAmount?.message || errors.minToken?.message}
-                  </FormErrorMessage>
+                  <FormErrorMessage>{error?.message}</FormErrorMessage>
                 </FormControl>
               )}
             />
             <Controller
-              name="maxAmount"
+              name="max"
               control={control}
-              render={({ field }) => (
-                <FormControl
-                  error={
-                    !!errors.maxAmount?.message || !!errors.maxToken?.message
-                  }
-                  className="mt-4 w-full"
-                >
+              render={({ field, fieldState: { error } }) => (
+                <FormControl error={!!error?.message} className="w-full mt-4">
                   <FormLabel>Maximun value</FormLabel>
-                  <TextFieldRoot className="pr-0">
+                  <TextFieldRoot>
                     <TextFieldInput
                       {...field}
                       placeholder="Enter amount"
                       autoComplete="off"
                       type="number"
-                      min={0}
                       step="any"
+                      onChange={(e) =>
+                        field.onChange(
+                          e.target.value ? Number(e.target.value) : '',
+                        )
+                      }
                     />
                     <TextFieldDecorator>
-                      <Controller
-                        name="maxToken"
-                        control={control}
-                        render={({ field, fieldState }) => (
-                          <FormControl error={!!fieldState.error}>
-                            <Select {...field}>
-                              <SelectTrigger className="justify-between h-10 border-l min-w-[140px] border-divider">
-                                <SelectValue placeholder="Choose token" />
-                              </SelectTrigger>
-                              <SelectContent>
-                                {tokenList.map((each) => (
-                                  <SelectItem
-                                    key={each.id}
-                                    value={String(each.id)}
-                                  >
-                                    <div className="flex items-center space-x-2">
-                                      <TokenAvatar
-                                        src={each.icon || ''}
-                                        name={each.symbol || ''}
-                                      />
-                                      <Typography level="p5">
-                                        {each.symbol}
-                                      </Typography>
-                                    </div>
-                                  </SelectItem>
-                                ))}
-                              </SelectContent>
-                            </Select>
-                          </FormControl>
-                        )}
-                      />
+                      <Typography level="p5">USD</Typography>
                     </TextFieldDecorator>
                   </TextFieldRoot>
-                  <FormErrorMessage>
-                    {errors.maxAmount?.message || errors.maxToken?.message}
-                  </FormErrorMessage>
+                  <FormErrorMessage>{error?.message}</FormErrorMessage>
                 </FormControl>
               )}
             />
-            <div className="grid grid-cols-2 gap-3 mt-8 w-full">
+            <div className="grid w-full grid-cols-2 gap-3 mt-8">
               <ModalTrigger asChild>
                 <Button color="white">Cancel</Button>
               </ModalTrigger>
diff --git a/apps/mochi-web/components/settings/general/TransactionPrivacy.tsx b/apps/mochi-web/components/settings/general/TransactionPrivacy.tsx
index 03037960b..b7787b151 100644
--- a/apps/mochi-web/components/settings/general/TransactionPrivacy.tsx
+++ b/apps/mochi-web/components/settings/general/TransactionPrivacy.tsx
@@ -1,19 +1,12 @@
 import { FormLabel } from '@mochi-ui/core'
 import React from 'react'
-import { Control, UseFormWatch } from 'react-hook-form'
-import { GeneralFormValue } from './types'
 import { PrivacySetting } from './PrivacySetting'
 
-interface Props {
-  control: Control<GeneralFormValue>
-  watch: UseFormWatch<GeneralFormValue>
-}
-
-export const TransactionPrivacy = ({ control, watch }: Props) => {
+export const TransactionPrivacy = () => {
   return (
     <div className="flex flex-col w-full max-w-md space-y-2">
       <FormLabel>Transaction Privacy</FormLabel>
-      <PrivacySetting {...{ control, watch }} name="transactionPrivacy" />
+      <PrivacySetting name="tx" />
     </div>
   )
 }
diff --git a/apps/mochi-web/components/settings/general/WalletsPrivacy.tsx b/apps/mochi-web/components/settings/general/WalletsPrivacy.tsx
index 31e2f3023..c1b6100af 100644
--- a/apps/mochi-web/components/settings/general/WalletsPrivacy.tsx
+++ b/apps/mochi-web/components/settings/general/WalletsPrivacy.tsx
@@ -1,19 +1,12 @@
 import { FormLabel } from '@mochi-ui/core'
 import React from 'react'
-import { Control, UseFormWatch } from 'react-hook-form'
-import { GeneralFormValue } from './types'
 import { PrivacySetting } from './PrivacySetting'
 
-interface Props {
-  control: Control<GeneralFormValue>
-  watch: UseFormWatch<GeneralFormValue>
-}
-
-export const WalletsPrivacy = ({ control, watch }: Props) => {
+export const WalletsPrivacy = () => {
   return (
     <div className="flex flex-col w-full max-w-md space-y-2">
       <FormLabel>Wallets</FormLabel>
-      <PrivacySetting {...{ control, watch }} name="walletsPrivacy" />
+      <PrivacySetting name="wallets" />
     </div>
   )
 }
diff --git a/apps/mochi-web/components/settings/general/types.ts b/apps/mochi-web/components/settings/general/types.ts
deleted file mode 100644
index b8cc0364a..000000000
--- a/apps/mochi-web/components/settings/general/types.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-interface TokenPriority {
-  id: string
-}
-
-export interface Message {
-  action: string
-  message: string
-}
-
-export interface TransactionLimit {
-  action: string
-  minToken: string
-  minAmount: string
-  maxToken: string
-  maxAmount: string
-}
-
-export interface CustomSettings {
-  platform: string
-  target_group: string
-}
-
-export interface CustomPrivacy {
-  custom_settings: CustomSettings[]
-  general_platform_group: string
-  general_target_group: string
-}
-
-export interface GeneralFormValue {
-  defaultMoneySource: string
-  defaultReceiverPlatform: string
-  defaultTokenPriority: TokenPriority[]
-  enableDefaultMessage: boolean
-  defaultMessage: Message[]
-  enableTransactionLimit: boolean
-  transactionLimit: TransactionLimit[]
-  transactionPrivacy: CustomPrivacy
-  socialAccountsPrivacy: CustomPrivacy
-  walletsPrivacy: CustomPrivacy
-}
diff --git a/apps/mochi-web/components/settings/notification/NotificationPage.tsx b/apps/mochi-web/components/settings/notification/NotificationPage.tsx
index ce2df5159..4ea0bb706 100644
--- a/apps/mochi-web/components/settings/notification/NotificationPage.tsx
+++ b/apps/mochi-web/components/settings/notification/NotificationPage.tsx
@@ -113,7 +113,7 @@ export function NotificationPage() {
     const body: RequestUpdateNotificationSettingPayloadRequest = {
       enable: enable ?? false,
       platforms,
-      flag: restData as Record<string, boolean | any>,
+      flags: restData as Record<string, boolean>,
     }
     try {
       const { data: newSettings }: ResponseUserNotificationSettingResponse =
@@ -306,7 +306,7 @@ export function NotificationPage() {
             <Typography className="py-4" level="h6">
               Platform Notification
             </Typography>
-            <Typography level="p5" color="textSecondary" className="-mt-2 pb-2">
+            <Typography level="p5" color="textSecondary" className="pb-2 -mt-2">
               Select the platform you want to receive the notification
             </Typography>
             <div className="divide-y">
diff --git a/apps/mochi-web/constants/api.ts b/apps/mochi-web/constants/api.ts
index 11f9c9d65..22c192647 100644
--- a/apps/mochi-web/constants/api.ts
+++ b/apps/mochi-web/constants/api.ts
@@ -80,4 +80,8 @@ export const GET_PATHS = {
     `/profile/${profileId}/pay-requests/${code}/enable`,
   DISABLE_PAYMENT_REQUEST: (profileId: string, code: string) =>
     `/profile/${profileId}/pay-requests/${code}/disable`,
+  GET_GENERAL_SETTINGS: (profileId: string) =>
+    `/profiles/${profileId}/settings/general`,
+  UPDATE_GENERAL_SETTINGS: (profileId: string) =>
+    `/profiles/${profileId}/settings/general`,
 }
diff --git a/apps/mochi-web/hooks/settings/useFetchGeneralSettings.ts b/apps/mochi-web/hooks/settings/useFetchGeneralSettings.ts
new file mode 100644
index 000000000..bae7a68d5
--- /dev/null
+++ b/apps/mochi-web/hooks/settings/useFetchGeneralSettings.ts
@@ -0,0 +1,22 @@
+import useSWR from 'swr'
+import { API, GET_PATHS } from '~constants/api'
+import { ResponseUserGeneralSettingResponse } from '~types/mochi-schema'
+
+export const SWR_KEY_FETCH_GENERAL_SETTINGS = 'SWR_KEY_FETCH_GENERAL_SETTINGS'
+
+export const useFetchGeneralSettings = (profileId?: string) => {
+  const { data, ...rest } = useSWR<ResponseUserGeneralSettingResponse>(
+    profileId ? [SWR_KEY_FETCH_GENERAL_SETTINGS, profileId] : null,
+    async ([_, id]: [any, string]) => {
+      if (!id) return []
+      return API.MOCHI.get(GET_PATHS.GET_GENERAL_SETTINGS(id)).json(
+        (r) => r ?? [],
+      )
+    },
+  )
+
+  return {
+    data: data?.data,
+    ...rest,
+  }
+}
diff --git a/apps/mochi-web/pages/tip-network.tsx b/apps/mochi-web/pages/tip-network.tsx
index fdedc8169..609a637a6 100644
--- a/apps/mochi-web/pages/tip-network.tsx
+++ b/apps/mochi-web/pages/tip-network.tsx
@@ -6,7 +6,6 @@ import { HOME_URL } from '~envs'
 import { SEO } from '~app/layout/seo'
 import { API } from '~constants/api'
 import dynamic from 'next/dynamic'
-import { TransactionGraphData, TransactionEdge } from '~types/mochi-schema'
 import { GraphData, NodeObject } from 'react-force-graph-2d'
 import { useMemo, useState } from 'react'
 import { ProfileBar } from '~components/TipNetwork/ProfileBar'
@@ -18,6 +17,28 @@ import {
   TipNetworkData,
 } from '~types/tip-graph'
 import { useDisclosure } from '@dwarvesf/react-hooks'
+import { Profile } from '@consolelabs/mochi-rest'
+
+export interface TransactionNode {
+  profile_id: string
+  total_volume: number
+  spend_volume: number
+  receive_volume: number
+  profile: Profile
+}
+
+export interface TransactionEdge {
+  from_profile_id: string
+  to_profile_id: string
+  total_volume: number
+  spend: number
+  receive: number
+}
+
+export interface TransactionGraphData {
+  nodes: TransactionNode[]
+  edges: TransactionEdge[]
+}
 
 const TipNetworkGraph = dynamic(
   () =>
@@ -142,7 +163,7 @@ export default function TipNetwork({ data }: TipNetworkProps) {
         description="Tip network from server"
         url={`${HOME_URL}/tip-network/`}
       />
-      <div className="flex relative w-full h-full">
+      <div className="relative flex w-full h-full">
         <TipNetworkGraph
           graphData={graphData}
           selectedNode={selectedNode}
diff --git a/apps/mochi-web/types/mochi-schema.ts b/apps/mochi-web/types/mochi-schema.ts
index ce5b6708a..4f5cdba72 100644
--- a/apps/mochi-web/types/mochi-schema.ts
+++ b/apps/mochi-web/types/mochi-schema.ts
@@ -9,8 +9,6 @@
  * ---------------------------------------------------------------
  */
 
-import { Profile } from '@consolelabs/mochi-rest'
-
 export interface ModelActivity {
   guild_default?: boolean
   id?: number
@@ -368,7 +366,6 @@ export interface ModelNewListedNFTCollection {
 export interface ModelNotificationFlag {
   description?: string
   group?: string
-  id?: number
   key?: string
 }
 
@@ -531,8 +528,6 @@ export interface ModelTxLimitSetting {
   action?: string
   max?: number
   min?: number
-  token?: ModelPayToken
-  token_id?: string
 }
 
 export interface ModelUser {
@@ -573,7 +568,7 @@ export interface ModelUserPaymentSetting {
   default_token_id?: string
   prioritized_token?: ModelPayToken[]
   prioritized_token_ids?: string[]
-  profileId?: string
+  profile_id?: string
   tx_limit_enable?: boolean
   tx_limit_settings?: ModelTxLimitSetting[]
 }
@@ -1037,7 +1032,7 @@ export interface RequestUpdateGuildRequest {
 
 export interface RequestUpdateNotificationSettingPayloadRequest {
   enable: boolean
-  flag: Record<string, boolean>
+  flags: Record<string, boolean>
   platforms: string[]
 }
 
@@ -2541,24 +2536,3 @@ export interface UuidNullUUID {
   /** Valid is true if UUID is not NULL */
   valid?: boolean
 }
-
-export interface TransactionNode {
-  profile_id: string
-  total_volume: number
-  spend_volume: number
-  receive_volume: number
-  profile: Profile
-}
-
-export interface TransactionEdge {
-  from_profile_id: string
-  to_profile_id: string
-  total_volume: number
-  spend: number
-  receive: number
-}
-
-export interface TransactionGraphData {
-  nodes: TransactionNode[]
-  edges: TransactionEdge[]
-}
diff --git a/apps/mochi-web/utils/platform.ts b/apps/mochi-web/utils/platform.ts
index 192aefdda..b980f7ba3 100644
--- a/apps/mochi-web/utils/platform.ts
+++ b/apps/mochi-web/utils/platform.ts
@@ -29,6 +29,12 @@ export const getPlatform = (key?: string) => {
         name: 'App',
       }
     }
+    case Platform.EvmChain: {
+      return {
+        icon: '',
+        name: 'EVM',
+      }
+    }
     default:
       return {
         icon: '',