Merge pull request #123 from TxnLab/dev

algorandfoundation · May 2, 2024 · 7efc28d · 7efc28d
2 parents d346b13 + cb009f0
commit 7efc28d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/contracts/bootstrap/package.json b/contracts/bootstrap/package.json
@@ -1,6 +1,6 @@
 {
     "name": "bootstrap",
-    "version": "0.8.0",
+    "version": "0.8.1",
     "description": "",
     "main": "index.ts",
     "scripts": {

diff --git a/contracts/package.json b/contracts/package.json
@@ -1,6 +1,6 @@
 {
     "name": "reti-contracts",
-    "version": "0.8.0",
+    "version": "0.8.1",
     "license": "MIT",
     "scripts": {
         "generate-client": "algokit generate client contracts/artifacts/ --language typescript  --output contracts/clients/{contract_name}Client.ts && ./update_contract_artifacts.sh``",

diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reti-ui",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "author": {
     "name": "Doug Richar",
     "email": "[email protected]"

diff --git a/ui/src/components/ValidatorDetails/Details.tsx b/ui/src/components/ValidatorDetails/Details.tsx
@@ -315,7 +315,7 @@ export function Details({ validator }: DetailsProps) {
                           params={{ validatorId: String(validator.config.sunsettingTo) }}
                           className="hover:underline underline-offset-4"
                         >
-                          Validator 4
+                          Validator {validator.config.sunsettingTo}
                         </Link>
                       </AlertDescription>
                     </Alert>

diff --git a/ui/src/components/ValidatorDetails/EditSunsettingInfo.tsx b/ui/src/components/ValidatorDetails/EditSunsettingInfo.tsx
@@ -204,7 +204,7 @@ export function EditSunsettingInfo({ validator }: EditSunsettingInfoProps) {
                             defaultMonth={field.value}
                             selected={field.value}
                             onSelect={field.onChange}
-                            disabled={(date) => date < dayjs().add(24, 'hours').toDate()}
+                            disabled={(date) => dayjs(date).isBefore(dayjs().startOf('day'))}
                             onDayClick={() => setIsCalendarOpen(false)}
                             initialFocus
                           />

diff --git a/ui/src/utils/contracts.ts b/ui/src/utils/contracts.ts
@@ -23,6 +23,7 @@ import {
   ValidatorConfig,
   ValidatorState,
 } from '@/interfaces/validator'
+import { dayjs } from '@/utils/dayjs'
 
 export function transformValidatorConfig(rawConfig: RawValidatorConfig): ValidatorConfig {
   return {
@@ -263,7 +264,12 @@ export function isStakingDisabled(
   const maxStakersReached = totalStakers >= maxStakers
   const maxStakeReached = Number(totalAlgoStaked) >= maxStake
 
-  return noPools || maxStakersReached || maxStakeReached
+  const isSunsetted =
+    validator.config.sunsettingOn > 0
+      ? dayjs.unix(validator.config.sunsettingOn).isBefore(dayjs())
+      : false
+
+  return noPools || maxStakersReached || maxStakeReached || isSunsetted
 }
 
 export function isUnstakingDisabled(