diff --git a/packages/neuron-ui/src/components/GeneralSetting/index.tsx b/packages/neuron-ui/src/components/GeneralSetting/index.tsx
index b673a0be26..1c691eac0e 100644
--- a/packages/neuron-ui/src/components/GeneralSetting/index.tsx
+++ b/packages/neuron-ui/src/components/GeneralSetting/index.tsx
@@ -1,21 +1,79 @@
 import React, { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Stack, PrimaryButton, Spinner, Text } from 'office-ui-fabric-react'
+import { Stack, PrimaryButton, Spinner, Text, ProgressIndicator } from 'office-ui-fabric-react'
 import { StateWithDispatch } from 'states/stateProvider/reducer'
 import { addPopup } from 'states/stateProvider/actionCreators'
 import { checkForUpdates, clearCellCache } from 'services/remote'
 
+const UpdateDownloadStatus = ({
+  progress = 0,
+  newVersion = '',
+}: React.PropsWithoutRef<{ progress: number; newVersion: string }>) => {
+  const [t] = useTranslation()
+  const available = newVersion !== '' && progress <= 0
+  const downloaded = progress >= 1
+
+  if (available) {
+    return (
+      <Stack>
+        <Text as="p" variant="medium">
+          {t('updates.updates-found-do-you-want-to-update', { version: newVersion })}
+        </Text>
+        <Stack horizontal horizontalAlign="start">
+          <PrimaryButton
+            styles={{
+              root: {
+                minWidth: 180,
+              },
+            }}
+          >
+            {t('updates.download-update')}
+          </PrimaryButton>
+        </Stack>
+      </Stack>
+    )
+  }
+
+  if (downloaded) {
+    return (
+      <Stack>
+        <Text as="p" variant="medium">
+          {t('updates.updates-downloaded-about-to-quit-and-install')}
+        </Text>
+        <Stack horizontal horizontalAlign="start">
+          <PrimaryButton
+            styles={{
+              root: {
+                minWidth: 180,
+              },
+            }}
+          >
+            {t('updates.quit-and-install')}
+          </PrimaryButton>
+        </Stack>
+      </Stack>
+    )
+  }
+
+  return (
+    <ProgressIndicator
+      percentComplete={progress}
+      label={t('updates.downloading-update')}
+      styles={{ root: { width: '250px' } }}
+    />
+  )
+}
+
 const GeneralSetting = ({ dispatch }: React.PropsWithoutRef<StateWithDispatch>) => {
   const [t] = useTranslation()
   const [clearing, setClearing] = useState(false)
   const [checkingUpdates, setCheckingUpdates] = useState(false) // TODO: checkingUpdates should be fetched from backend
+  const [downloadingUpdate] = useState(false)
 
   const checkUpdates = useCallback(() => {
     setCheckingUpdates(true)
     setTimeout(() => {
-      checkForUpdates().finally(() => {
-        setCheckingUpdates(false)
-      })
+      checkForUpdates()
     }, 100)
   }, [dispatch])
 
@@ -33,18 +91,22 @@ const GeneralSetting = ({ dispatch }: React.PropsWithoutRef<StateWithDispatch>)
     <Stack tokens={{ childrenGap: 15 }}>
       <Stack>
         <Stack horizontal horizontalAlign="start">
-          <PrimaryButton
-            onClick={checkUpdates}
-            disabled={checkingUpdates}
-            ariaDescription="Check updates"
-            styles={{
-              root: {
-                minWidth: 150,
-              },
-            }}
-          >
-            {checkingUpdates ? <Spinner /> : t('updates.check-updates')}
-          </PrimaryButton>
+          {downloadingUpdate ? (
+            <UpdateDownloadStatus progress={1} newVersion="v0.25.2" />
+          ) : (
+            <PrimaryButton
+              onClick={checkUpdates}
+              disabled={checkingUpdates}
+              ariaDescription="Check updates"
+              styles={{
+                root: {
+                  minWidth: 180,
+                },
+              }}
+            >
+              {checkingUpdates ? <Spinner /> : t('updates.check-updates')}
+            </PrimaryButton>
+          )}
         </Stack>
       </Stack>
 
@@ -59,7 +121,7 @@ const GeneralSetting = ({ dispatch }: React.PropsWithoutRef<StateWithDispatch>)
             ariaDescription="Clear cache"
             styles={{
               root: {
-                minWidth: 150,
+                minWidth: 180,
               },
             }}
           >
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index cffcea49d9..a13864f43b 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -178,7 +178,7 @@
         "network": "Network"
       },
       "general": {
-        "clear-cache": "Clear cache",
+        "clear-cache": "Clear Cache",
         "clear-cache-description": "Clear cache if you encounter data sync or balance display problems. Neuron will rescan block data.",
         "show": "Show",
         "hide": "Hide"
@@ -346,7 +346,12 @@
     },
     "updates": {
       "check-updates": "Check for Updates",
-      "download-update": "Download Update"
+      "downloading-update": "Downloading update...",
+      "update-not-available": "There are currently no updates available.",
+      "updates-found-do-you-want-to-update": "An update ({{version}}) is available, do you want to download and update now?",
+      "download-update": "Download Update",
+      "updates-downloaded-about-to-quit-and-install": "Update downloaded. Neuron will quit and install the update...",
+      "quit-and-install": "Quit and Install"
     }
   }
 }
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 06db116a9c..f44d578059 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -346,7 +346,12 @@
     },
     "updates": {
       "check-updates": "检查更新",
-      "download-update": "下载更新"
+      "downloading-update": "正在下载更新...",
+      "update-not-available": "没有可供升级的新版本。",
+      "updates-found-do-you-want-to-update": "有可供升级的新版本({{version}})。现在进行下载和升级吗？",
+      "download-update": "下载更新以升级",
+      "updates-downloaded-about-to-quit-and-install": "下载完成。Neuron 将退出并安装新版本...",
+      "quit-and-install": "退出并安装"
     }
   }
 }