diff --git a/nym-wallet/nym-wallet-types/src/network/qa.rs b/nym-wallet/nym-wallet-types/src/network/qa.rs
index 776270c8825..761d08f6145 100644
--- a/nym-wallet/nym-wallet-types/src/network/qa.rs
+++ b/nym-wallet/nym-wallet-types/src/network/qa.rs
@@ -12,7 +12,7 @@ pub(crate) const STAKE_DENOM: DenomDetails = DenomDetails::new("unyx", "nyx", 6)
 // -- Contract addresses --
 
 pub(crate) const MIXNET_CONTRACT_ADDRESS: &str =
-    "n1khq8f8vhah0gtljahrnsr3utl5lrhlf0xafs6pkvetnyumv7vt4qxh2ckx";
+    "n1hm4y6fzgxgu688jgf7ek66px6xkrtmn3gyk8fax3eawhp68c2d5qujz296";
 pub(crate) const VESTING_CONTRACT_ADDRESS: &str =
     "n1jlzdxnyces4hrhqz68dqk28mrw5jgwtcfq0c2funcwrmw0dx9l9s8nnnvj";
 pub(crate) const ECASH_CONTRACT_ADDRESS: &str =
@@ -28,7 +28,7 @@ pub(crate) const COCONUT_DKG_CONTRACT_ADDRESS: &str =
 
 pub(crate) fn validators() -> Vec<ValidatorDetails> {
     vec![ValidatorDetails::new(
-        "https://benny-validator.qa.nymte.ch/",
+        "https://qa-validator.qa.nymte.ch/",
         Some("https://qa-nym-api.qa.nymte.ch/api"),
         Some("wss://qa-validator.qa.nymte.ch/websocket"),
     )]
diff --git a/nym-wallet/src/components/Bonding/BondUpdateCard.tsx b/nym-wallet/src/components/Bonding/BondUpdateCard.tsx
index 9523b194c0c..9cd24d0af8a 100644
--- a/nym-wallet/src/components/Bonding/BondUpdateCard.tsx
+++ b/nym-wallet/src/components/Bonding/BondUpdateCard.tsx
@@ -1,16 +1,8 @@
 import React from 'react';
 import { Box, Button, Stack, Tooltip, Typography } from '@mui/material';
-import { Network } from 'src/types';
 import { NymCard } from 'src/components';
-import { TBondedMixnode } from 'src/requests/mixnodeDetails';
 
-export const BondUpdateCard = ({
-  setSuccesfullUpdate,
-}: {
-  mixnode: TBondedMixnode;
-  network?: Network;
-  setSuccesfullUpdate: (staus: boolean) => void;
-}) => (
+export const BondUpdateCard = ({ setSuccesfullUpdate }: { setSuccesfullUpdate: (staus: boolean) => void }) => (
   <Stack gap={2}>
     <NymCard
       borderless
@@ -47,7 +39,6 @@ export const BondUpdateCard = ({
           </Tooltip>
         </Box>
       }
-      children={undefined}
     />
   </Stack>
 );
diff --git a/nym-wallet/src/components/Bonding/BondedNymNode.tsx b/nym-wallet/src/components/Bonding/BondedNymNode.tsx
index 77d2ef3004c..6186891e7ff 100644
--- a/nym-wallet/src/components/Bonding/BondedNymNode.tsx
+++ b/nym-wallet/src/components/Bonding/BondedNymNode.tsx
@@ -77,7 +77,6 @@ export const BondedNymNode = ({
     operatorRewards,
     operatorCost,
     delegators,
-    role,
     identityKey,
     host,
   } = nymnode;
diff --git a/nym-wallet/src/components/Bonding/NodeStats.tsx b/nym-wallet/src/components/Bonding/NodeStats.tsx
index 7489fa8f782..8c492968c78 100644
--- a/nym-wallet/src/components/Bonding/NodeStats.tsx
+++ b/nym-wallet/src/components/Bonding/NodeStats.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-import { Stack, Typography, Box, useTheme, Grid, LinearProgress, LinearProgressProps, Button } from '@mui/material';
-import { useNavigate } from 'react-router-dom';
+import { Stack, Typography, Box, useTheme, Grid, LinearProgress, LinearProgressProps } from '@mui/material';
 import { Cell, Pie, PieChart, Legend, ResponsiveContainer } from 'recharts';
 import { SelectionChance } from '@nymproject/types';
 import { TBondedMixnode } from 'src/requests/mixnodeDetails';
@@ -50,7 +49,6 @@ const StatRow = ({
 export const NodeStats = ({ mixnode }: { mixnode: TBondedMixnode }) => {
   const { activeSetProbability, routingScore } = mixnode;
   const theme = useTheme();
-  const navigate = useNavigate();
 
   // clamp routing score to [0-100]
   const score = Math.min(Math.max(routingScore || 0, 0), 100);
@@ -74,10 +72,6 @@ export const NodeStats = ({ mixnode }: { mixnode: TBondedMixnode }) => {
     }
   };
 
-  const handleGoToTestNode = () => {
-    navigate('/bonding/node-settings', { state: 'test-node' });
-  };
-
   const renderLegend = () => (
     <Stack
       alignItems="center"
diff --git a/nym-wallet/src/components/Bonding/forms/legacyForms/BondGatewayForm.tsx b/nym-wallet/src/components/Bonding/forms/legacyForms/BondGatewayForm.tsx
index f7e498349df..843d6040532 100644
--- a/nym-wallet/src/components/Bonding/forms/legacyForms/BondGatewayForm.tsx
+++ b/nym-wallet/src/components/Bonding/forms/legacyForms/BondGatewayForm.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Box } from '@mui/material';
 import { NodeTypeSelector } from 'src/components';
 import { CurrencyDenom, TNodeType } from '@nymproject/types';
-import { GatewayAmount, GatewayData, Signature } from 'src/pages/bonding/types';
+import { GatewayAmount, GatewayData } from 'src/pages/bonding/types';
 import GatewayInitForm from './GatewayInitForm';
 import GatewayAmountForm from './GatewayAmountForm';
 
@@ -15,7 +15,6 @@ export const BondGatewayForm = ({
   onSelectNodeType,
   onValidateGatewayData,
   onValidateAmountData,
-  onValidateSignature,
 }: {
   step: 1 | 2 | 3 | 4;
   gatewayData: GatewayData;
@@ -25,7 +24,6 @@ export const BondGatewayForm = ({
   onSelectNodeType: (nodeType: TNodeType) => void;
   onValidateGatewayData: (data: GatewayData) => void;
   onValidateAmountData: (data: GatewayAmount) => Promise<void>;
-  onValidateSignature: (signature: Signature) => void;
 }) => (
   <>
     {step === 1 && (
diff --git a/nym-wallet/src/components/Bonding/forms/nym-node/FormContext.tsx b/nym-wallet/src/components/Bonding/forms/nym-node/FormContext.tsx
index 77c62522576..6ad0bcadbc3 100644
--- a/nym-wallet/src/components/Bonding/forms/nym-node/FormContext.tsx
+++ b/nym-wallet/src/components/Bonding/forms/nym-node/FormContext.tsx
@@ -1,4 +1,4 @@
-import { createContext, useContext, useState } from 'react';
+import React, { createContext, useContext, useMemo, useState } from 'react';
 import { CurrencyDenom } from '@nymproject/types';
 import { TBondNymNodeArgs, TBondMixNodeArgs } from 'src/types';
 
@@ -44,7 +44,7 @@ const FormContext = createContext<FormContextType>({
   signature: undefined,
   setSignature: () => {},
 
-  onError: (e: string) => {},
+  onError: () => {},
 });
 
 const FormContextProvider = ({ children }: { children: React.ReactNode }) => {
@@ -61,25 +61,36 @@ const FormContextProvider = ({ children }: { children: React.ReactNode }) => {
     console.error(e);
   };
 
-  return (
-    <FormContext.Provider
-      value={{
-        step,
-        setStep,
-        nymNodeData,
-        setNymNodeData,
-        costParams,
-        setCostParams,
-        amountData,
-        setAmountData,
-        signature,
-        setSignature,
-        onError,
-      }}
-    >
-      {children}
-    </FormContext.Provider>
+  const value = useMemo(
+    () => ({
+      step,
+      setStep,
+      nymNodeData,
+      setNymNodeData,
+      costParams,
+      setCostParams,
+      amountData,
+      setAmountData,
+      signature,
+      setSignature,
+      onError,
+    }),
+    [
+      step,
+      setStep,
+      nymNodeData,
+      setNymNodeData,
+      costParams,
+      setCostParams,
+      amountData,
+      setAmountData,
+      signature,
+      setSignature,
+      onError,
+    ],
   );
+
+  return <FormContext.Provider value={value}>{children}</FormContext.Provider>;
 };
 
 export const useFormContext = () => useContext(FormContext);
diff --git a/nym-wallet/src/components/Bonding/forms/nym-node/NymNodeAmount.tsx b/nym-wallet/src/components/Bonding/forms/nym-node/NymNodeAmount.tsx
index bb31485cc21..550dd639ad1 100644
--- a/nym-wallet/src/components/Bonding/forms/nym-node/NymNodeAmount.tsx
+++ b/nym-wallet/src/components/Bonding/forms/nym-node/NymNodeAmount.tsx
@@ -1,11 +1,12 @@
+import React from 'react';
 import { Stack, TextField, Box, FormHelperText } from '@mui/material';
 import { useForm } from 'react-hook-form';
 import { TBondNymNodeArgs } from 'src/types';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { SimpleModal } from 'src/components/Modals/SimpleModal';
-import { nymNodeAmountSchema } from './amountValidationSchema';
 import { CurrencyFormField } from '@nymproject/react/currency/CurrencyFormField';
 import { checkHasEnoughFunds } from 'src/utils';
+import { nymNodeAmountSchema } from './amountValidationSchema';
 
 const defaultNymNodeCostParamValues: TBondNymNodeArgs['costParams'] = {
   profit_margin_percent: '10',
diff --git a/nym-wallet/src/components/Bonding/forms/nym-node/NymNodeData.tsx b/nym-wallet/src/components/Bonding/forms/nym-node/NymNodeData.tsx
index c1c35b521a0..e32068a9c67 100644
--- a/nym-wallet/src/components/Bonding/forms/nym-node/NymNodeData.tsx
+++ b/nym-wallet/src/components/Bonding/forms/nym-node/NymNodeData.tsx
@@ -3,7 +3,6 @@ import { Stack, TextField, FormControlLabel, Checkbox } from '@mui/material';
 import { useForm } from 'react-hook-form';
 import { IdentityKeyFormField } from '@nymproject/react/mixnodes/IdentityKeyFormField';
 import { TBondNymNodeArgs } from 'src/types';
-import { useFormContext } from './FormContext';
 import { yupResolver } from '@hookform/resolvers/yup';
 import * as yup from 'yup';
 import { isValidHostname, validateRawPort } from 'src/utils';
@@ -21,9 +20,7 @@ const yupValidationSchema = yup.object().shape({
     .string()
     .required('A host is required')
     .test('no-whitespace', 'Host cannot contain whitespace', (value) => !/\s/.test(value || ''))
-    .test('valid-host', 'A valid host is required', (value) => {
-      return value ? isValidHostname(value) : false;
-    }),
+    .test('valid-host', 'A valid host is required', (value) => (value ? isValidHostname(value) : false)),
 
   custom_http_port: yup
     .number()
diff --git a/nym-wallet/src/components/Bonding/forms/nym-node/NymNodeSignature.tsx b/nym-wallet/src/components/Bonding/forms/nym-node/NymNodeSignature.tsx
index fe8054129ce..e1e5814d551 100644
--- a/nym-wallet/src/components/Bonding/forms/nym-node/NymNodeSignature.tsx
+++ b/nym-wallet/src/components/Bonding/forms/nym-node/NymNodeSignature.tsx
@@ -31,20 +31,19 @@ const NymNodeSignature = ({
 
   const {
     register,
-    handleSubmit,
     formState: { errors },
   } = useForm<Signature>();
 
   const generateMessage = async () => {
     try {
-      const message = await generateNymNodeMsgPayload({
+      const msg = await generateNymNodeMsgPayload({
         nymNode,
         pledge,
         costParams,
       });
 
-      if (message) {
-        setMessage(message);
+      if (msg) {
+        setMessage(msg);
       }
     } catch (e) {
       console.error(e);
diff --git a/nym-wallet/src/components/Bonding/modals/BondGatewayModal.tsx b/nym-wallet/src/components/Bonding/modals/BondGatewayModal.tsx
index e4ced6b2565..1060b7c533e 100644
--- a/nym-wallet/src/components/Bonding/modals/BondGatewayModal.tsx
+++ b/nym-wallet/src/components/Bonding/modals/BondGatewayModal.tsx
@@ -4,14 +4,10 @@ import { CurrencyDenom, TNodeType } from '@nymproject/types';
 import { ConfirmTx } from 'src/components/ConfirmTX';
 import { ModalListItem } from 'src/components/Modals/ModalListItem';
 import { SimpleModal } from 'src/components/Modals/SimpleModal';
-import { TPoolOption } from 'src/components/TokenPoolSelector';
 import { useGetFee } from 'src/hooks/useGetFee';
-import { GatewayAmount, GatewayData, Signature } from 'src/pages/bonding/types';
-import { simulateBondGateway, simulateVestingBondGateway } from 'src/requests';
-import { TBondGatewayArgs } from 'src/types';
+import { GatewayAmount, GatewayData } from 'src/pages/bonding/types';
 import { BalanceWarning } from 'src/components/FeeWarning';
 import { AppContext } from 'src/context';
-import { gatewayToTauri } from '../utils';
 import { BondGatewayForm } from '../forms/legacyForms/BondGatewayForm';
 
 const defaultGatewayValues: GatewayData = {
@@ -34,14 +30,12 @@ const defaultAmountValues = (denom: CurrencyDenom) => ({
 export const BondGatewayModal = ({
   denom,
   hasVestingTokens,
-  onBondGateway,
   onSelectNodeType,
   onClose,
   onError,
 }: {
   denom: CurrencyDenom;
   hasVestingTokens: boolean;
-  onBondGateway: (data: TBondGatewayArgs, tokenPool: TPoolOption) => void;
   onSelectNodeType: (type: TNodeType) => void;
   onClose: () => void;
   onError: (e: string) => void;
@@ -49,9 +43,8 @@ export const BondGatewayModal = ({
   const [step, setStep] = useState<1 | 2 | 3>(1);
   const [gatewayData, setGatewayData] = useState<GatewayData>(defaultGatewayValues);
   const [amountData, setAmountData] = useState<GatewayAmount>(defaultAmountValues(denom));
-  const [signature, setSignature] = useState<string>();
 
-  const { fee, getFee, resetFeeState, feeError } = useGetFee();
+  const { fee, resetFeeState, feeError } = useGetFee();
   const { userBalance } = useContext(AppContext);
 
   useEffect(() => {
@@ -83,32 +76,7 @@ export const BondGatewayModal = ({
     setStep(3);
   };
 
-  const handleUpdateSignature = async (data: Signature) => {
-    setSignature(data.signature);
-
-    const payload = {
-      pledge: amountData.amount,
-      msgSignature: data.signature,
-      gateway: gatewayToTauri(gatewayData),
-    };
-
-    if (amountData.tokenPool === 'balance') {
-      await getFee<TBondGatewayArgs>(simulateBondGateway, payload);
-    } else {
-      await getFee<TBondGatewayArgs>(simulateVestingBondGateway, payload);
-    }
-  };
-
-  const handleConfirm = async () => {
-    await onBondGateway(
-      {
-        pledge: amountData.amount,
-        msgSignature: signature as string,
-        gateway: gatewayToTauri(gatewayData),
-      },
-      amountData.tokenPool as TPoolOption,
-    );
-  };
+  const handleConfirm = async () => {};
 
   if (fee) {
     return (
@@ -154,7 +122,6 @@ export const BondGatewayModal = ({
           hasVestingTokens={hasVestingTokens}
           onValidateGatewayData={handleUpdateGatwayData}
           onValidateAmountData={handleUpdateAmountData}
-          onValidateSignature={handleUpdateSignature}
           onSelectNodeType={onSelectNodeType}
         />
       </Box>
diff --git a/nym-wallet/src/components/Bonding/modals/BondNymNodeModal.tsx b/nym-wallet/src/components/Bonding/modals/BondNymNodeModal.tsx
index 2e09aa503f6..bfed31e7659 100644
--- a/nym-wallet/src/components/Bonding/modals/BondNymNodeModal.tsx
+++ b/nym-wallet/src/components/Bonding/modals/BondNymNodeModal.tsx
@@ -1,8 +1,8 @@
-import { useContext, useEffect } from 'react';
+import React, { useContext, useEffect } from 'react';
 import { ConfirmTx } from 'src/components/ConfirmTX';
 import { ModalListItem } from 'src/components/Modals/ModalListItem';
 import { useGetFee } from 'src/hooks/useGetFee';
-import { MixnodeAmount, Signature } from 'src/pages/bonding/types';
+import { Signature } from 'src/pages/bonding/types';
 import { BalanceWarning } from 'src/components/FeeWarning';
 import { AppContext } from 'src/context';
 import FormContextProvider, { useFormContext } from '../forms/nym-node/FormContext';
@@ -11,7 +11,7 @@ import NymNodeAmount from '../forms/nym-node/NymNodeAmount';
 import NymNodeSignature from '../forms/nym-node/NymNodeSignature';
 
 export const BondNymNodeModal = ({ onClose }: { onClose: () => void }) => {
-  const { fee, getFee, resetFeeState, feeError } = useGetFee();
+  const { fee, resetFeeState, feeError } = useGetFee();
   const { userBalance } = useContext(AppContext);
   const { setStep, step, onError, setSignature, amountData, costParams, nymNodeData } = useFormContext();
 
@@ -21,18 +21,10 @@ export const BondNymNodeModal = ({ onClose }: { onClose: () => void }) => {
     }
   }, [feeError]);
 
-  const handleBack = () => {
-    setStep(step);
-  };
-
   const handleUpdateMixnodeData = async () => {
     setStep(2);
   };
 
-  const handleUpdateAmountData = async (data: MixnodeAmount) => {
-    setStep(3);
-  };
-
   const handleUpdateSignature = async (data: Signature) => {
     setSignature(data.signature);
   };
diff --git a/nym-wallet/src/components/Bonding/modals/NymNodeSuccessModal.tsx b/nym-wallet/src/components/Bonding/modals/NymNodeSuccessModal.tsx
deleted file mode 100644
index dd8cc177f80..00000000000
--- a/nym-wallet/src/components/Bonding/modals/NymNodeSuccessModal.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import React from 'react';
-import { Stack, Typography, SxProps, Box, List, ListItem } from '@mui/material';
-import { Link } from '@nymproject/react/link/Link';
-import { ConfirmationModal } from 'src/components/Modals/ConfirmationModal';
-import { ErrorModal } from 'src/components/Modals/ErrorModal';
-import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline';
-
-export type ConfirmationDetailProps = {
-  status: 'success' | 'error';
-};
-
-const list = [
-  <>
-    Node type changed to{' '}
-    <Typography component="span" variant="body2" fontWeight="bold">
-      Nym node.
-    </Typography>
-  </>,
-  <>
-    If you migrated a mix node:{' '}
-    <Typography component="span" variant="body2" fontWeight="bold">
-      your profit margin and operating cost stayed the same.
-    </Typography>
-  </>,
-  <>
-    If you migrated a gateway: by default{' '}
-    <Typography component="span" variant="body2" fontWeight="bold">
-      your profit margin is set to the minimum of 20% and operating cost to 400 NYM.
-    </Typography>
-  </>,
-  <>
-    You can change these values anytime under{' '}
-    <Typography component="span" variant="body2" fontWeight="bold">
-      node settings.
-    </Typography>
-  </>,
-];
-
-export const NymNodeSuccessModal = ({
-  status,
-  onClose,
-  sx,
-  backdropProps,
-}: ConfirmationDetailProps & {
-  onClose: () => void;
-  sx?: SxProps;
-  backdropProps?: object;
-  children?: React.ReactNode;
-}) => {
-  if (status === 'error') {
-    <ErrorModal open message="error message" onClose={onClose} />;
-  }
-
-  return (
-    <ConfirmationModal
-      open
-      onConfirm={onClose}
-      onClose={onClose}
-      title=""
-      confirmButton="Ok"
-      maxWidth="xs"
-      fullWidth
-      sx={sx}
-      backdropProps={backdropProps}
-    >
-      <Box>
-        <Box alignItems="center" marginBottom={3}>
-          <CheckCircleOutlineIcon sx={{ color: 'success.main', fontSize: 24 }} />
-          <Typography variant="subtitle1" fontWeight={600} sx={{ color: 'success.main' }}>
-            Sucess!
-          </Typography>
-          <Typography variant="body2">Your node is now upgraded.</Typography>
-        </Box>
-        <Stack alignItems="start" spacing={3}>
-          <Typography variant="body2" fontWeight={600}>
-            List of changes
-          </Typography>
-          <List sx={{ listStyleType: 'disc', pl: 2 }}>
-            {list.map((text, index) => (
-              <ListItem key={index} sx={{ display: 'list-item' }}>
-                <Typography variant="body2">{text}</Typography>
-              </ListItem>
-            ))}
-          </List>
-        </Stack>
-      </Box>
-    </ConfirmationModal>
-  );
-};
diff --git a/nym-wallet/src/components/Bonding/modals/UpdateBondAmountNymNode.tsx b/nym-wallet/src/components/Bonding/modals/UpdateBondAmountNymNode.tsx
index 258806f940d..e634b1c354f 100644
--- a/nym-wallet/src/components/Bonding/modals/UpdateBondAmountNymNode.tsx
+++ b/nym-wallet/src/components/Bonding/modals/UpdateBondAmountNymNode.tsx
@@ -8,7 +8,7 @@ import { DecCoin } from '@nymproject/types';
 import { ConfirmTx } from 'src/components/ConfirmTX';
 import { useGetFee } from 'src/hooks/useGetFee';
 import { decCoinToDisplay, validateAmount } from 'src/utils';
-import { simulateUpdateBond, simulateVestingUpdateBond } from 'src/requests';
+import { simulateUpdateBond } from 'src/requests';
 import { TSimulateUpdateBondArgs, TUpdateBondArgs } from 'src/types';
 import { AppContext } from 'src/context';
 import { BalanceWarning } from 'src/components/FeeWarning';
@@ -32,7 +32,7 @@ export const UpdateBondAmountNymNode = ({
   const [newBond, setNewBond] = useState<DecCoin | undefined>();
   const [errorAmount, setErrorAmount] = useState(false);
 
-  const { printBalance, printVestedBalance, userBalance } = useContext(AppContext);
+  const { printBalance, userBalance } = useContext(AppContext);
 
   useEffect(() => {
     if (feeError) {
diff --git a/nym-wallet/src/components/NymCard.tsx b/nym-wallet/src/components/NymCard.tsx
index 768f0811aba..ae3d84fe238 100644
--- a/nym-wallet/src/components/NymCard.tsx
+++ b/nym-wallet/src/components/NymCard.tsx
@@ -20,7 +20,7 @@ export const NymCard: FCWithChildren<{
   dataTestid?: string;
   sx?: SxProps;
   sxTitle?: SxProps;
-  children: React.ReactNode;
+  children?: React.ReactNode;
 }> = ({ title, subheader, Action, Icon, noPadding, borderless, children, dataTestid, sx, sxTitle }) => (
   <Card variant="outlined" sx={{ overflow: 'auto', ...(borderless && { border: 'none', dropShadow: 'none' }), ...sx }}>
     <CardHeader
diff --git a/nym-wallet/src/context/bonding.tsx b/nym-wallet/src/context/bonding.tsx
index edbea071525..51671e02e66 100644
--- a/nym-wallet/src/context/bonding.tsx
+++ b/nym-wallet/src/context/bonding.tsx
@@ -1,12 +1,13 @@
 /* eslint-disable @typescript-eslint/naming-convention */
+import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
 import { FeeDetails, TransactionExecuteResult } from '@nymproject/types';
-import { createContext, useContext, useEffect, useMemo, useState } from 'react';
 import { isGateway, isMixnode, TUpdateBondArgs, isNymNode, TNymNodeSignatureArgs } from 'src/types';
 import { Console } from 'src/utils/console';
 import useGetNodeDetails from 'src/hooks/useGetNodeDetails';
 import { TBondedNymNode } from 'src/requests/nymNodeDetails';
 import { TBondedMixnode } from 'src/requests/mixnodeDetails';
 import { TBondedGateway } from 'src/requests/gatewayDetails';
+import { toPercentFloatString } from 'src/utils';
 import { AppContext } from './main';
 import {
   claimOperatorReward,
@@ -16,12 +17,10 @@ import {
   vestingClaimOperatorReward,
   generateNymNodeMsgPayload as generateNymNodeMsgPayloadReq,
   updateBond as updateBondReq,
-  vestingUpdateBond as vestingUpdateBondReq,
   migrateVestedMixnode as tauriMigrateVestedMixnode,
   migrateLegacyMixnode as migrateLegacyMixnodeReq,
   migrateLegacyGateway as migrateLegacyGatewayReq,
 } from '../requests';
-import { toPercentFloatString } from 'src/utils';
 
 export type TBondedNode = TBondedMixnode | TBondedGateway | TBondedNymNode;
 
@@ -141,7 +140,6 @@ export const BondingContextProvider: FCWithChildren = ({ children }): JSX.Elemen
 
   const generateNymNodeMsgPayload = async (data: TNymNodeSignatureArgs) => {
     setIsLoading(true);
-    console.log('data', data);
 
     try {
       const message = await generateNymNodeMsgPayloadReq({
@@ -159,6 +157,7 @@ export const BondingContextProvider: FCWithChildren = ({ children }): JSX.Elemen
     } finally {
       setIsLoading(false);
     }
+    return undefined;
   };
 
   const migrateVestedMixnode = async () => {
diff --git a/nym-wallet/src/context/mocks/delegations.tsx b/nym-wallet/src/context/mocks/delegations.tsx
index 966a9f994cd..f2aea600bc2 100644
--- a/nym-wallet/src/context/mocks/delegations.tsx
+++ b/nym-wallet/src/context/mocks/delegations.tsx
@@ -7,7 +7,6 @@ import {
   FeeDetails,
   TransactionExecuteResult,
 } from '@nymproject/types';
-import { ms } from 'date-fns/locale';
 import { DelegationContext, TDelegationTransaction } from '../delegations';
 
 import { mockSleep } from './utils';
diff --git a/nym-wallet/src/hooks/useGetNodeDetails.ts b/nym-wallet/src/hooks/useGetNodeDetails.ts
index 24f0e834334..9049b87ce5f 100644
--- a/nym-wallet/src/hooks/useGetNodeDetails.ts
+++ b/nym-wallet/src/hooks/useGetNodeDetails.ts
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { TBondedNode } from 'src/context';
 import { getGatewayDetails } from 'src/requests/gatewayDetails';
 import { getMixnodeDetails } from 'src/requests/mixnodeDetails';
@@ -10,7 +10,7 @@ const useGetNodeDetails = (clientAddress?: string, network?: string) => {
   const [isLoading, setIsLoading] = useState(false);
   const [isError, setIsError] = useState(false);
 
-  const getNodeDetails = async (clientAddress: string) => {
+  const getNodeDetails = async (address: string) => {
     setIsError(false);
     setBondedNode(null);
     setIsLoading(true);
@@ -18,7 +18,7 @@ const useGetNodeDetails = (clientAddress?: string, network?: string) => {
     // Check if the address has a Nym node bonded
     const nymnode: TauriReq<typeof getNymNodeDetails> = {
       name: 'getNymNodeBondDetails',
-      request: () => getNymNodeDetails(clientAddress),
+      request: () => getNymNodeDetails(address),
       onFulfilled: (value) => {
         if (value) {
           setBondedNode(value);
@@ -29,7 +29,7 @@ const useGetNodeDetails = (clientAddress?: string, network?: string) => {
     // Check if the address has a Mix node bonded
     const mixnode: TauriReq<typeof getMixnodeDetails> = {
       name: 'getMixnodeDetails',
-      request: () => getMixnodeDetails(clientAddress),
+      request: () => getMixnodeDetails(address),
       onFulfilled: (value) => {
         if (value) {
           setBondedNode(value);
diff --git a/nym-wallet/src/pages/bonding/Bonding.tsx b/nym-wallet/src/pages/bonding/Bonding.tsx
index 8aac282eadf..843ada1f5ac 100644
--- a/nym-wallet/src/pages/bonding/Bonding.tsx
+++ b/nym-wallet/src/pages/bonding/Bonding.tsx
@@ -1,4 +1,4 @@
-import { useContext, useEffect, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { FeeDetails } from '@nymproject/types';
 import { Alert, AlertTitle, Box, Button, Typography } from '@mui/material';
@@ -18,8 +18,8 @@ import { VestingWarningModal } from 'src/components/VestingWarningModal';
 import MigrateLegacyNode from 'src/components/Bonding/modals/MigrateLegacyNode';
 import { BondedNymNode } from 'src/components/Bonding/BondedNymNode';
 import { UpdateBondAmountNymNode } from 'src/components/Bonding/modals/UpdateBondAmountNymNode';
-import { BondingContextProvider, useBondingContext } from '../../context';
 import { BondNymNodeModalWithState } from 'src/components/Bonding/modals/BondNymNodeModal';
+import { BondingContextProvider, useBondingContext } from '../../context';
 
 export const Bonding = () => {
   const [showModal, setShowModal] = useState<
@@ -33,11 +33,7 @@ export const Bonding = () => {
     | 'update-bond-nymnode'
   >();
 
-  const {
-    network,
-    clientDetails,
-    userBalance: { originalVesting },
-  } = useContext(AppContext);
+  const { network } = useContext(AppContext);
 
   const navigate = useNavigate();
 
diff --git a/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/GeneralNymNodeSettings.tsx b/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/GeneralNymNodeSettings.tsx
index 3e69492ea90..76721d99373 100644
--- a/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/GeneralNymNodeSettings.tsx
+++ b/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/GeneralNymNodeSettings.tsx
@@ -1,4 +1,4 @@
-import { useContext, useState } from 'react';
+import React, { useContext, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { Box, Button, Divider, Grid, Stack, TextField, Typography } from '@mui/material';
@@ -17,7 +17,7 @@ import { TBondedNymNode } from 'src/requests/nymNodeDetails';
 
 export const GeneralNymNodeSettings = ({ bondedNode }: { bondedNode: TBondedNymNode }) => {
   const [openConfirmationModal, setOpenConfirmationModal] = useState<boolean>(false);
-  const { getFee, fee, resetFeeState } = useGetFee();
+  const { fee, resetFeeState } = useGetFee();
   const { userBalance } = useContext(AppContext);
 
   const theme = useTheme();
@@ -134,7 +134,7 @@ export const GeneralNymNodeSettings = ({ bondedNode }: { bondedNode: TBondedNymN
               size="large"
               variant="contained"
               disabled={isSubmitting || !isDirty || !isValid}
-              onClick={handleSubmit((data) => undefined)}
+              onClick={handleSubmit(() => undefined)}
               sx={{ m: 3, mr: 0 }}
               fullWidth
             >
diff --git a/nym-wallet/src/pages/node-settings/system-variables.tsx b/nym-wallet/src/pages/node-settings/system-variables.tsx
index 2eed8103664..13fb9a60c62 100644
--- a/nym-wallet/src/pages/node-settings/system-variables.tsx
+++ b/nym-wallet/src/pages/node-settings/system-variables.tsx
@@ -7,7 +7,6 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { InclusionProbabilityResponse, SelectionChance } from '@nymproject/types';
 import { validationSchema } from './validationSchema';
 import { InfoTooltip } from '../../components';
-import { useCheckOwnership } from '../../hooks/useCheckOwnership';
 import { updateMixnodeCostParams } from '../../requests';
 import { AppContext } from '../../context';
 import { Console } from '../../utils/console';
@@ -74,7 +73,6 @@ export const SystemVariables = ({
 }) => {
   const [nodeUpdateResponse, setNodeUpdateResponse] = useState<'success' | 'failed'>();
   const { mixnodeDetails } = useContext(AppContext);
-  const { ownership } = useCheckOwnership();
 
   const {
     register,
diff --git a/nym-wallet/src/requests/mixnodeDetails.ts b/nym-wallet/src/requests/mixnodeDetails.ts
index 4a8c34997d0..093f880261e 100644
--- a/nym-wallet/src/requests/mixnodeDetails.ts
+++ b/nym-wallet/src/requests/mixnodeDetails.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/naming-convention */
 import {
   DecCoin,
   decimalToFloatApproximation,
diff --git a/nym-wallet/src/requests/nymNodeDetails.ts b/nym-wallet/src/requests/nymNodeDetails.ts
index e691526773b..b4d9278d579 100644
--- a/nym-wallet/src/requests/nymNodeDetails.ts
+++ b/nym-wallet/src/requests/nymNodeDetails.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+
 import { calculateStake, Console, decCoinToDisplay, fireRequests, TauriReq, toPercentIntegerString } from 'src/utils';
 import { DecCoin, decimalToFloatApproximation, decimalToPercentage } from '@nymproject/types';
 import { TNodeRole } from 'src/types';