From 245185710a6defef773bad2a37bc126541dc6b02 Mon Sep 17 00:00:00 2001
From: pierre <dommerc.pierre@gmail.com>
Date: Fri, 5 May 2023 11:03:44 +0200
Subject: [PATCH] strip off `v` in node version

---
 .../src/components/Bonding/forms/GatewayInitForm.tsx     | 9 ++++++++-
 .../src/components/Bonding/forms/MixnodeInitForm.tsx     | 9 ++++++++-
 .../general-settings/GeneralGatewaySettings.tsx          | 5 +++--
 .../general-settings/GeneralMixnodeSettings.tsx          | 3 ++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/nym-wallet/src/components/Bonding/forms/GatewayInitForm.tsx b/nym-wallet/src/components/Bonding/forms/GatewayInitForm.tsx
index 1d104d5409..670c5a9e0a 100644
--- a/nym-wallet/src/components/Bonding/forms/GatewayInitForm.tsx
+++ b/nym-wallet/src/components/Bonding/forms/GatewayInitForm.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
+import { clean } from 'semver';
 import { Checkbox, FormControlLabel, Stack, TextField } from '@mui/material';
 import { IdentityKeyFormField } from '@nymproject/react/mixnodes/IdentityKeyFormField';
 import { yupResolver } from '@hookform/resolvers/yup/dist/yup';
@@ -24,7 +25,13 @@ const GatewayInitForm = ({
 
   const handleRequestValidation = (event: { detail: { step: number } }) => {
     if (event.detail.step === 1) {
-      handleSubmit(onNext)();
+      handleSubmit((data) => {
+        const validatedData = {
+          ...data,
+          version: clean(data.version) as string,
+        };
+        onNext(validatedData);
+      })();
     }
   };
 
diff --git a/nym-wallet/src/components/Bonding/forms/MixnodeInitForm.tsx b/nym-wallet/src/components/Bonding/forms/MixnodeInitForm.tsx
index 7bd858a312..3c97bb22ce 100644
--- a/nym-wallet/src/components/Bonding/forms/MixnodeInitForm.tsx
+++ b/nym-wallet/src/components/Bonding/forms/MixnodeInitForm.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
+import { clean } from 'semver';
 import { Checkbox, FormControlLabel, Stack, TextField } from '@mui/material';
 import { IdentityKeyFormField } from '@nymproject/react/mixnodes/IdentityKeyFormField';
 import { yupResolver } from '@hookform/resolvers/yup/dist/yup';
@@ -18,7 +19,13 @@ const MixnodeInitForm = ({ mixnodeData, onNext }: { mixnodeData: MixnodeData; on
 
   const handleRequestValidation = (event: { detail: { step: number } }) => {
     if (event.detail.step === 1) {
-      handleSubmit(onNext)();
+      handleSubmit((data) => {
+        const validatedData = {
+          ...data,
+          version: clean(data.version),
+        };
+        onNext(validatedData);
+      })();
     }
   };
 
diff --git a/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/GeneralGatewaySettings.tsx b/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/GeneralGatewaySettings.tsx
index 2a75866ab2..f024fcc149 100644
--- a/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/GeneralGatewaySettings.tsx
+++ b/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/GeneralGatewaySettings.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
 import { useForm } from 'react-hook-form';
+import { clean } from 'semver';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { Button, Divider, Typography, TextField, Grid, Box } from '@mui/material';
 import { useTheme } from '@mui/material/styles';
@@ -50,7 +51,7 @@ export const GeneralGatewaySettings = ({ bondedNode }: { bondedNode: TBondedGate
         host,
         mix_port: mixPort,
         location,
-        version,
+        version: clean(version) as string,
         clients_port: httpApiPort,
         verloc_port: bondedNode.verlocPort,
       };
@@ -208,7 +209,7 @@ export const GeneralGatewaySettings = ({ bondedNode }: { bondedNode: TBondedGate
       <SimpleModal
         open={openConfirmationModal}
         header="Your changes are submitted to the blockchain"
-        subHeader="Remember to change the values 
+        subHeader="Remember to change the values
         on your gateways’s config file too."
         okLabel="close"
         hideCloseIcon
diff --git a/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/GeneralMixnodeSettings.tsx b/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/GeneralMixnodeSettings.tsx
index 405122b660..bf146bf0e9 100644
--- a/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/GeneralMixnodeSettings.tsx
+++ b/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/GeneralMixnodeSettings.tsx
@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { clean } from 'semver';
 import { Button, Divider, Grid, Stack, TextField, Typography } from '@mui/material';
 import { useTheme } from '@mui/material/styles';
 import { isMixnode } from 'src/types';
@@ -46,7 +47,7 @@ export const GeneralMixnodeSettings = ({ bondedNode }: { bondedNode: TBondedMixn
         mix_port: mixPort,
         verloc_port: verlocPort,
         http_api_port: httpApiPort,
-        version,
+        version: clean(version) as string,
       };
       try {
         if (bondedNode.proxy) {