diff --git a/nym-wallet/src/pages/delegate/SuccessView.tsx b/nym-wallet/src/pages/delegate/SuccessView.tsx index d89b185d27..581fc0d91b 100644 --- a/nym-wallet/src/pages/delegate/SuccessView.tsx +++ b/nym-wallet/src/pages/delegate/SuccessView.tsx @@ -9,7 +9,7 @@ export const SuccessView: React.FC<{ details?: { amount: string; address: string <> {details && ( diff --git a/nym-wallet/src/pages/undelegate/UndelegateForm.tsx b/nym-wallet/src/pages/undelegate/UndelegateForm.tsx index 3a5bb4ba9d..39c663f5f8 100644 --- a/nym-wallet/src/pages/undelegate/UndelegateForm.tsx +++ b/nym-wallet/src/pages/undelegate/UndelegateForm.tsx @@ -92,24 +92,22 @@ export const UndelegateForm = ({ render={() => ( - pendingUndelegations?.some((item) => item.mix_identity === opt.node_identity) || false - } - options={delegations || []} + getOptionDisabled={(opt) => pendingUndelegations?.some((item) => item.mix_identity === opt) || false} + options={delegations?.map((d) => d.node_identity) || []} renderOption={(props, opt) => ( ) => { - setValue('identity', opt.node_identity); + setValue('identity', opt); props.onClick!(e); }} disablePadding disableGutters > item.mix_identity === opt.node_identity) + pendingUndelegations?.some((item) => item.mix_identity === opt) ? `Pending - Expected time of completion: ${ currentEndEpoch ? format(new Date(Number(currentEndEpoch) * 1000), 'HH:mm') : 'N/A' }`