From 57d32d2b3db0aabf3c36ec0ea7408134418f77b0 Mon Sep 17 00:00:00 2001
From: stefanpetkov90 <stefan.petkov90@gmail.com>
Date: Wed, 28 Sep 2022 18:09:44 +0300
Subject: [PATCH] CUDOS-1529 Out of range Select component

---
 .../RedelegationModal/Redelegation.tsx        | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/containers/ValidatorDetails/components/Details/components/ValidatorInfo/components/RedelegationModal/Redelegation.tsx b/src/containers/ValidatorDetails/components/Details/components/ValidatorInfo/components/RedelegationModal/Redelegation.tsx
index 218416d..7f9ce14 100644
--- a/src/containers/ValidatorDetails/components/Details/components/ValidatorInfo/components/RedelegationModal/Redelegation.tsx
+++ b/src/containers/ValidatorDetails/components/Details/components/ValidatorInfo/components/RedelegationModal/Redelegation.tsx
@@ -48,7 +48,6 @@ const Redelegation: React.FC<RedelegationProps> = ({
   handleModal
 }) => {
   const [delegated, setDelegated] = useState<string>('')
-  const [redelegationAddress, setRedelegationAddress] = useState<string>('')
   const [redelegationAmount, setRedelegationAmount] = useState<string>('')
   const { validator, amount, fee } = modalProps
   const dispatch = useDispatch()
@@ -57,8 +56,14 @@ const Redelegation: React.FC<RedelegationProps> = ({
     ({ profile }: RootState) => profile
   )
   const validators = useSelector(({ validator }: RootState) => validator.items)
-  const data = validators.map((item) => ({
-    value: item.validator,
+
+  const filteredValidators = validators.filter(
+    (item) => item.validator !== validator?.address
+  )
+
+  const data = filteredValidators.map((item, idx) => ({
+    value: (idx + 1).toString(),
+    address: item.validator,
     label: (
       <AvatarName
         name={item.moniker}
@@ -68,8 +73,16 @@ const Redelegation: React.FC<RedelegationProps> = ({
     )
   }))
 
-  const handleDropdown = (validatorAddress: string) => {
-    setRedelegationAddress(validatorAddress)
+  const [redelegationAddress, setRedelegationAddress] = useState<string>(
+    data[0].address
+  )
+
+  const handleDropdown = (validatorIndex: string) => {
+    const validatorAddress = data.filter(
+      (item, idx) => idx + 1 === Number(validatorIndex)
+    )
+
+    setRedelegationAddress(validatorAddress[0].address)
   }
 
   useEffect(() => {