From 9c73493b635f15ef1bee7c7c2892019b432288b0 Mon Sep 17 00:00:00 2001
From: fabiolalombardim <lombardifabiola@hotmail.com>
Date: Sat, 3 Feb 2024 19:09:46 +0100
Subject: [PATCH] fixes requested

---
 components/choices/index.js |  4 ++--
 components/tokens/index.js  |  6 ++++--
 utils.js                    | 12 +++---------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/components/choices/index.js b/components/choices/index.js
index feeea00..9e56ce6 100644
--- a/components/choices/index.js
+++ b/components/choices/index.js
@@ -39,7 +39,7 @@ const updateChoiceById = async (req, response) => {
   let i = 0;
 
   try {
-    const {votesData, isXTZ} = getInputFromSigPayload(payloadBytes);
+    const { votesData } = getInputFromSigPayload(payloadBytes);
     let db_connect = dbo.getDb("Lite");
 
     const pollID = votesData[0].pollID;
@@ -95,7 +95,7 @@ const updateChoiceById = async (req, response) => {
       token.tokenID,
       block,
       address,
-      isXTZ
+      poll.isXTZ
     );
 
     if (!total) {
diff --git a/components/tokens/index.js b/components/tokens/index.js
index e59a4a0..41c22fe 100644
--- a/components/tokens/index.js
+++ b/components/tokens/index.js
@@ -75,7 +75,8 @@ const getVotingPowerAtLevel = async (req, response) => {
       daoContract,
       tokenID,
       level,
-      userAddress
+      userAddress,
+      isXTZ = false
     );
 
     const votingXTZWeight = await getUserTotalVotingPowerAtReferenceBlock(
@@ -84,7 +85,8 @@ const getVotingPowerAtLevel = async (req, response) => {
       daoContract,
       tokenID,
       level,
-      userAddress
+      userAddress,
+      isXTZ = true
     );
 
     response.json({ votingWeight, votingXTZWeight });
diff --git a/utils.js b/utils.js
index 65a0e9f..6dd32a1 100644
--- a/utils.js
+++ b/utils.js
@@ -138,18 +138,15 @@ const getUserTotalVotingPowerAtReferenceBlock = async (
   tokenID,
   level,
   userAddress,
-  isXTZ
+  isXTZ = false
 ) => {
   try {
-
+    let userVotingPower = new BigNumber(0);
     if (!isXTZ) {
-      let userVotingPower = new BigNumber(0);
-
       const isTokenDelegation = await isTokenDelegationSupported(
         network,
         address
       );
-
       if (isTokenDelegation) {
         const userVotePower = await getUserTotalVotingWeightAtBlock(
           network,
@@ -184,15 +181,12 @@ const getUserTotalVotingPowerAtReferenceBlock = async (
 
       return userVotingPower;
     } else {
-      let userVotingPower = new BigNumber(0);
-
       const selfBalance = await getUserXTZBalanceAtLevel(
         network,
         level,
         userAddress
       );
-      userVotingPower = userVotingPower.plus(selfBalance);
-      return userVotingPower;
+      return userVotingPower.plus(selfBalance);
     }
   } catch (error) {
     console.log("error: ", error);