From daf58b833cccb6f7ee607e37003a7dc5916da213 Mon Sep 17 00:00:00 2001 From: devchenyan Date: Thu, 22 Aug 2024 18:12:08 +0800 Subject: [PATCH 1/4] fix: the remaining time display is abnormal --- packages/neuron-ui/src/components/NervosDAORecord/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/neuron-ui/src/components/NervosDAORecord/index.tsx b/packages/neuron-ui/src/components/NervosDAORecord/index.tsx index 58ee5342cd..35eb848f87 100644 --- a/packages/neuron-ui/src/components/NervosDAORecord/index.tsx +++ b/packages/neuron-ui/src/components/NervosDAORecord/index.tsx @@ -91,7 +91,7 @@ export const DAORecord = ({ epochParser(withdrawEpoch || currentEpoch) ) - const leftEpochs = Math.max(compensationEndEpochValue - currentEpochValue, 0) + const leftEpochs = Math.max((compensationEndEpochValue || 0) - currentEpochValue, 0) let leftHours = '' let leftDays = '' From c823b47d0359fe137a59e23384d3be031fc5d3a7 Mon Sep 17 00:00:00 2001 From: devchenyan Date: Fri, 23 Aug 2024 10:47:29 +0800 Subject: [PATCH 2/4] fix --- .../neuron-ui/src/components/NervosDAORecord/index.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/neuron-ui/src/components/NervosDAORecord/index.tsx b/packages/neuron-ui/src/components/NervosDAORecord/index.tsx index 35eb848f87..5d6ecb6658 100644 --- a/packages/neuron-ui/src/components/NervosDAORecord/index.tsx +++ b/packages/neuron-ui/src/components/NervosDAORecord/index.tsx @@ -91,7 +91,7 @@ export const DAORecord = ({ epochParser(withdrawEpoch || currentEpoch) ) - const leftEpochs = Math.max((compensationEndEpochValue || 0) - currentEpochValue, 0) + const leftEpochs = Math.max(compensationEndEpochValue - currentEpochValue, 0) let leftHours = '' let leftDays = '' @@ -137,7 +137,9 @@ export const DAORecord = ({ break } case CellStatus.Deposited: { - if (leftHours) { + if (!compensationEndEpochValue) { + message = '' + } else if (leftHours) { message = t('nervos-dao.compensation-period.stage-messages.next-compensation-cycle-hours', { hours: leftHours || '--', }) @@ -149,7 +151,9 @@ export const DAORecord = ({ break } case CellStatus.Locked: { - if (leftHours) { + if (!compensationEndEpochValue) { + message = '' + } else if (leftHours) { message = t('nervos-dao.compensation-period.stage-messages.compensation-cycle-will-end-hours', { hours: leftHours || '--', }) From 7b36af665e5e5f219af360a59a87d6e9b66414a5 Mon Sep 17 00:00:00 2001 From: devchenyan Date: Mon, 26 Aug 2024 23:18:48 +0800 Subject: [PATCH 3/4] fix --- packages/neuron-ui/src/components/NervosDAORecord/index.tsx | 4 ++-- packages/neuron-ui/src/locales/en.json | 3 ++- packages/neuron-ui/src/locales/es.json | 3 ++- packages/neuron-ui/src/locales/fr.json | 3 ++- packages/neuron-ui/src/locales/zh-tw.json | 3 ++- packages/neuron-ui/src/locales/zh.json | 3 ++- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/neuron-ui/src/components/NervosDAORecord/index.tsx b/packages/neuron-ui/src/components/NervosDAORecord/index.tsx index 5d6ecb6658..b031f61381 100644 --- a/packages/neuron-ui/src/components/NervosDAORecord/index.tsx +++ b/packages/neuron-ui/src/components/NervosDAORecord/index.tsx @@ -138,7 +138,7 @@ export const DAORecord = ({ } case CellStatus.Deposited: { if (!compensationEndEpochValue) { - message = '' + message = t('nervos-dao.compensation-period.stage-messages.calculating-the-compensation-cycle') } else if (leftHours) { message = t('nervos-dao.compensation-period.stage-messages.next-compensation-cycle-hours', { hours: leftHours || '--', @@ -152,7 +152,7 @@ export const DAORecord = ({ } case CellStatus.Locked: { if (!compensationEndEpochValue) { - message = '' + message = t('nervos-dao.compensation-period.stage-messages.calculating-the-compensation-cycle') } else if (leftHours) { message = t('nervos-dao.compensation-period.stage-messages.compensation-cycle-will-end-hours', { hours: leftHours || '--', diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json index e9e8e74d39..dfd55fdb08 100644 --- a/packages/neuron-ui/src/locales/en.json +++ b/packages/neuron-ui/src/locales/en.json @@ -784,7 +784,8 @@ "compensation-cycle-will-end": "Compensation cycle ends in approximately {{days}} days", "compensation-cycle-will-end-hours": "Compensation cycle ends in approximately {{hours}} hours", "compensation-cycle-has-ended": "Cycle has ended, CKB is ready to be unlocked", - "unlocking": "Unlocking..." + "unlocking": "Unlocking...", + "calculating-the-compensation-cycle": "Calculating the compensation cycle" } } }, diff --git a/packages/neuron-ui/src/locales/es.json b/packages/neuron-ui/src/locales/es.json index 77c7261a60..0cb4932d15 100644 --- a/packages/neuron-ui/src/locales/es.json +++ b/packages/neuron-ui/src/locales/es.json @@ -767,7 +767,8 @@ "compensation-cycle-will-end": "El ciclo de compensación termina en aproximadamente {{days}} días", "compensation-cycle-will-end-hours": "El ciclo de compensación termina en aproximadamente {{hours}} horas", "compensation-cycle-has-ended": "El ciclo ha terminado, CKB está listo para ser desbloqueado", - "unlocking": "Desbloqueando..." + "unlocking": "Desbloqueando...", + "calculating-the-compensation-cycle": "Calculando el ciclo de compensación" } } }, diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json index 28eedd730d..654493db76 100644 --- a/packages/neuron-ui/src/locales/fr.json +++ b/packages/neuron-ui/src/locales/fr.json @@ -774,7 +774,8 @@ "compensation-cycle-will-end": "La période de compensation se termine dans environ {{days}} jours", "compensation-cycle-will-end-hours": "La période de compensation se termine dans environ {{hours}} heures", "compensation-cycle-has-ended": "Le cycle est terminé, les CKB sont prêts à être déverrouillés", - "unlocking": "Déverrouillage en cours..." + "unlocking": "Déverrouillage en cours...", + "calculating-the-compensation-cycle": "" } } }, diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json index 8fa1bbc4e2..8f96a5ed44 100644 --- a/packages/neuron-ui/src/locales/zh-tw.json +++ b/packages/neuron-ui/src/locales/zh-tw.json @@ -778,7 +778,8 @@ "compensation-cycle-will-end": "補償週期約在 {{days}} 天后結束", "compensation-cycle-will-end-hours": "補償週期約在 {{hours}} 小時后結束", "compensation-cycle-has-ended": "補償週期已結束, 可以解鎖 CKB", - "unlocking": "解鎖中..." + "unlocking": "解鎖中...", + "calculating-the-compensation-cycle": "正在計算補償週期" } } }, diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json index b6e0b16b36..ed50683b81 100644 --- a/packages/neuron-ui/src/locales/zh.json +++ b/packages/neuron-ui/src/locales/zh.json @@ -777,7 +777,8 @@ "compensation-cycle-will-end": "补偿周期约在 {{days}} 天后结束", "compensation-cycle-will-end-hours": "补偿周期约在 {{hours}} 小时后结束", "compensation-cycle-has-ended": "补偿周期已结束, 可以解锁 CKB", - "unlocking": "解锁中..." + "unlocking": "解锁中...", + "calculating-the-compensation-cycle": "正在计算补偿周期" } } }, From 4420604492e7b44986f2cc983ded89080eaf8d33 Mon Sep 17 00:00:00 2001 From: devchenyan Date: Mon, 26 Aug 2024 23:23:38 +0800 Subject: [PATCH 4/4] fix --- packages/neuron-ui/src/locales/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json index 654493db76..6d5890ad11 100644 --- a/packages/neuron-ui/src/locales/fr.json +++ b/packages/neuron-ui/src/locales/fr.json @@ -775,7 +775,7 @@ "compensation-cycle-will-end-hours": "La période de compensation se termine dans environ {{hours}} heures", "compensation-cycle-has-ended": "Le cycle est terminé, les CKB sont prêts à être déverrouillés", "unlocking": "Déverrouillage en cours...", - "calculating-the-compensation-cycle": "" + "calculating-the-compensation-cycle": "Calculer le cycle de compensation" } } },