From 3ec72b187d78def597399ccb49573bfeae855a9a Mon Sep 17 00:00:00 2001
From: Nischal Shetty <nischal2004coc@gmail.com>
Date: Sat, 7 Sep 2024 18:48:25 +0530
Subject: [PATCH] feat(rescan): ability to rescan timechain (#838)

---
 src/components/RescanChain.tsx       | 19 +++++++++----------
 src/components/Settings.tsx          | 14 ++++----------
 src/i18n/locales/en/translation.json | 11 +++++++++++
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/components/RescanChain.tsx b/src/components/RescanChain.tsx
index 6cdb10ef..a1aa6203 100644
--- a/src/components/RescanChain.tsx
+++ b/src/components/RescanChain.tsx
@@ -46,7 +46,7 @@ const RescanChainForm = ({ disabled, submitButtonText, onSubmit }: RescanChainFo
         validate={(values) => {
           const errors = {} as FormikErrors<RescanChainFormValues>
           if (typeof values.blockheight !== 'number' || values.blockheight < 0) {
-            errors.blockheight = t('Please provide a valid blockheight value greater than or equal to {{ min }}.', {
+            errors.blockheight = t('rescan_chain.feedback_invalid_blockheight', {
               min: 0,
             })
           }
@@ -57,16 +57,16 @@ const RescanChainForm = ({ disabled, submitButtonText, onSubmit }: RescanChainFo
         {({ handleSubmit, handleBlur, handleChange, values, touched, errors, isSubmitting }) => (
           <rb.Form onSubmit={handleSubmit} noValidate lang={i18n.resolvedLanguage || i18n.language}>
             <rb.Form.Group controlId="blockheight" className="mb-4">
-              <rb.Form.Label>{t('Blockheight')}</rb.Form.Label>
+              <rb.Form.Label>{t('rescan_chain.label_blockheight')}</rb.Form.Label>
               <rb.Form.Text className="d-block text-secondary mb-2">
-                {t('The height of the chain at which the rescan process is started.')}
+                {t('rescan_chain.description_blockheight')}
               </rb.Form.Text>
               <rb.InputGroup hasValidation>
                 <rb.InputGroup.Text id="blockheight-addon1">
                   <Sprite symbol="block" width="24" height="24" name="Block" />
                 </rb.InputGroup.Text>
                 <rb.Form.Control
-                  aria-label={t('Blockheight')}
+                  aria-label={t('rescan_chain.label_blockheight')}
                   className="slashed-zeroes"
                   name="blockheight"
                   type="number"
@@ -131,7 +131,7 @@ export default function RescanChain({ wallet }: RescanChainProps) {
       } catch (e: any) {
         if (signal.aborted) return
 
-        const message = t('Error while starting the rescan process. Reason: {{ reason }}', {
+        const message = t('rescan_chain.error_rescanning_failed', {
           reason: e.message || t('global.errors.reason_unknown'),
         })
         setAlert({ variant: 'danger', message })
@@ -142,16 +142,15 @@ export default function RescanChain({ wallet }: RescanChainProps) {
 
   return (
     <div className="import-wallet">
-      <PageTitle
-        title={t('Rescan timechain (Experimental)')}
-        subtitle={t('Rescan the local timechain for wallet related transactions.')}
-      />
+      <PageTitle title={t('rescan_chain.title')} subtitle={t('rescan_chain.subtitle')} />
       {alert && <rb.Alert variant={alert.variant}>{alert.message}</rb.Alert>}
       <div className="mb-4">
         {serviceInfo?.rescanning === true && <rb.Alert variant="success">{t('app.alert_rescan_in_progress')}</rb.Alert>}
         <RescanChainForm
           disabled={serviceInfo?.rescanning}
-          submitButtonText={(isSubmitting) => t(isSubmitting ? 'Rescan timechain' : 'Rescan timechain')}
+          submitButtonText={(isSubmitting) =>
+            t(isSubmitting ? 'rescan_chain.text_button_submitting' : 'rescan_chain.text_button_submit')
+          }
           onSubmit={async (values) => {
             const abortCtrl = new AbortController()
 
diff --git a/src/components/Settings.tsx b/src/components/Settings.tsx
index aeed2f20..06539730 100644
--- a/src/components/Settings.tsx
+++ b/src/components/Settings.tsx
@@ -16,7 +16,7 @@ import languages from '../i18n/languages'
 import styles from './Settings.module.css'
 import SeedModal from './settings/SeedModal'
 import FeeConfigModal from './settings/FeeConfigModal'
-import { isDebugFeatureEnabled, isDevMode } from '../constants/debugFeatures'
+import { isDevMode } from '../constants/debugFeatures'
 import { isFeatureEnabled } from '../constants/features'
 import { CurrentWallet } from '../context/WalletContext'
 
@@ -213,16 +213,10 @@ export default function Settings({ wallet, stopWallet }: SettingsProps) {
             {t('settings.button_switch_wallet')}
           </Link>
 
-          {serviceInfo && isFeatureEnabled('rescanChain', serviceInfo) && isDebugFeatureEnabled('rescanChainPage') && (
-            <Link
-              to={routes.rescanChain}
-              className={`btn btn-outline-dark ${styles['settings-btn']} position-relative`}
-            >
+          {serviceInfo && isFeatureEnabled('rescanChain', serviceInfo) && (
+            <Link to={routes.rescanChain} className={`btn btn-outline-dark ${styles['settings-btn']}`}>
               <Sprite symbol="block" width="24" height="24" />
-              Rescan chain
-              <span className="position-absolute top-50 start-0 translate-middle badge rounded-pill bg-warning">
-                dev
-              </span>
+              {t('settings.rescan_chain')}
             </Link>
           )}
 
diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
index db1efc05..701aa507 100644
--- a/src/i18n/locales/en/translation.json
+++ b/src/i18n/locales/en/translation.json
@@ -236,6 +236,7 @@
     "confirm_locking_modal_title": "Lock Wallet",
     "confirm_locking_modal_body_earn": "Earn is active. Locking the wallet will stop the service. You can close the browser window to let it run in the background.",
     "confirm_locking_modal_body_jam": "A collaborative transaction is being executed. Locking the wallet will stop the service. You can close the browser window to let it run in the background.",
+    "rescan_chain": "Rescan chain",
     "fees": {
       "title": "Fee Limits",
       "description": "Adjust mining fees and collaborator fees according to your needs. These settings will be reset to default values when the JoinMarket service restarts, e.g. on a system reboot. For more information, <1>see the documentation on fees</1>.",
@@ -270,6 +271,16 @@
       "error_saving_fee_config_failed": "Error while saving fee config values. Reason: {{ reason }}"
     }
   },
+  "rescan_chain": {
+    "title": "Rescan timechain (Experimental)",
+    "subtitle": "Rescan the local timechain for wallet related transactions.",
+    "label_blockheight": "Rescan height",
+    "description_blockheight": "The height of the chain at which the rescan process is started.",
+    "error_rescanning_failed": "Error while starting the rescan process. Reason: {{ reason }}",
+    "feedback_invalid_blockheight": "Please provide a valid value between {{ min }} and the current blockheight.",
+    "text_button_submit": "Rescan timechain",
+    "text_button_submitting": "Rescanning timechain..."
+  },
   "logs": {
     "title": "Logs",
     "error_loading_logs_failed": "Could not retrieve log file."