small recfactors for wallet smoosh

nymtech · Sep 12, 2024 · a9beb4a · a9beb4a
1 parent d15f25e
commit a9beb4a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
diff --git a/nym-wallet/src/components/Bonding/NodeStats.tsx b/nym-wallet/src/components/Bonding/NodeStats.tsx
@@ -53,7 +53,7 @@ export const NodeStats = ({ mixnode }: { mixnode: TBondedMixnode }) => {
   const navigate = useNavigate();
 
   // clamp routing score to [0-100]
-  const score = Math.min(Math.max(routingScore, 0), 100);
+  const score = Math.min(Math.max(routingScore || 0, 0), 100);
 
   const data = [
     { key: 'routingScore', value: score },

diff --git a/nym-wallet/src/context/bonding.tsx b/nym-wallet/src/context/bonding.tsx
@@ -79,13 +79,13 @@ export type TBondedMixnode = {
   operatorRewards?: DecCoin;
   delegators: number;
   status: MixnodeStatus;
-  proxy?: string;
+  proxy?: string | null;
   operatorCost: DecCoin;
   host: string;
   estimatedRewards?: DecCoin;
   activeSetProbability?: SelectionChance;
   standbySetProbability?: SelectionChance;
-  routingScore: number;
+  routingScore?: number;
   httpApiPort: number;
   mixPort: number;
   verlocPort: number;

diff --git a/nym-wallet/src/pages/Admin/index.tsx b/nym-wallet/src/pages/Admin/index.tsx
@@ -26,29 +26,15 @@ const AdminForm: FCWithChildren<{
         <Grid container spacing={3}>
           <Grid item xs={12}>
             <TextField
-              {...register('minimum_mixnode_pledge')}
+              {...register('minimum_pledge')}
               required
               variant="outlined"
               id="minimum_mixnode_bond"
               name="minimum_mixnode_bond"
               label="Minumum mixnode bond"
               fullWidth
-              error={!!errors.minimum_mixnode_pledge}
-              helperText={`${errors?.minimum_mixnode_pledge?.amount?.message} ${errors?.minimum_mixnode_pledge?.denom?.message}`}
-              InputLabelProps={{ shrink: true }}
-            />
-          </Grid>
-          <Grid item xs={12}>
-            <TextField
-              {...register('minimum_gateway_pledge')}
-              required
-              variant="outlined"
-              id="minimum_gateway_bond"
-              name="minimum_gateway_bond"
-              label="Minumum gateway bond"
-              fullWidth
-              error={!!errors.minimum_gateway_pledge}
-              helperText={`${errors?.minimum_gateway_pledge?.amount?.message} ${errors?.minimum_gateway_pledge?.denom?.message}`}
+              error={!!errors.minimum_pledge}
+              helperText={`${errors?.minimum_pledge?.amount?.message} ${errors?.minimum_pledge?.denom?.message}`}
               InputLabelProps={{ shrink: true }}
             />
           </Grid>

diff --git a/nym-wallet/src/utils/common.ts b/nym-wallet/src/utils/common.ts
@@ -251,3 +251,13 @@ export const getIntervalAsDate = async () => {
 
   return { nextEpoch, nextInterval };
 };
+
+export const calculateStake = (pledge: string, delegations: string) => {
+  let stake;
+  try {
+    stake = unymToNym(Big(pledge).plus(delegations));
+  } catch (e: any) {
+    Console.warn(`not a valid decimal number: ${e}`);
+  }
+  return stake;
+};