From 9502bc67b2c327a564f19157893d88ba79a6ff72 Mon Sep 17 00:00:00 2001
From: Szymon Szlachtowicz <38212223+Szymx95@users.noreply.github.com>
Date: Fri, 17 Sep 2021 11:08:42 +0200
Subject: [PATCH] Fix vote chart (#77)

---
 .../components/ProposalVoteCard/VoteChart.tsx | 97 ++++++++++---------
 .../src/components/VotePropose.tsx            |  8 +-
 2 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/packages/proposal-components/src/components/ProposalVoteCard/VoteChart.tsx b/packages/proposal-components/src/components/ProposalVoteCard/VoteChart.tsx
index ddcbe65..516feb9 100644
--- a/packages/proposal-components/src/components/ProposalVoteCard/VoteChart.tsx
+++ b/packages/proposal-components/src/components/ProposalVoteCard/VoteChart.tsx
@@ -46,52 +46,22 @@ export function VoteChart({ votingRoom, proposingAmount, selectedVote, isAnimati
     <Votes ref={ref}>
       <VotesChart className={selectedVote || tabletMode ? '' : 'notModal'}>
         <VoteBox
-          style={{
-            filter: voteWinner && voteWinner === 2 ? 'grayscale(1)' : 'none',
-            alignItems: mobileVersion ? 'flex-start' : 'center',
-          }}
-        >
-          <VoteIcon
-            src={voteWinner === 1 ? crossWinnerIcon : crossIcon}
-            width={voteWinner === 1 ? '18px' : '14px'}
-            style={{
-              marginLeft: mobileVersion ? '10px' : '0',
-            }}
-          />
-          <span>
-            {' '}
-            {isAnimation && proposingAmount && selectedVote && selectedVote === 0 ? (
-              <CountUp end={votingRoom.totalVotesAgainst.toNumber() + proposingAmount} separator="," />
-            ) : (
-              addCommas(votingRoom.totalVotesAgainst.toNumber())
-            )}{' '}
-            <span style={{ fontWeight: 'normal' }}>ABC</span>
-          </span>
-        </VoteBox>
+          voteType={2}
+          mobileVersion={mobileVersion}
+          totalVotes={votingRoom.totalVotesAgainst.toNumber()}
+          won={voteWinner === 2}
+          selected={isAnimation && selectedVote === 0}
+          proposingAmount={proposingAmount}
+        />
         {!voteWinner && <TimeLeft className={selectedVote ? '' : 'notModal'}>{formatTimeLeft(timeLeft)}</TimeLeft>}
         <VoteBox
-          style={{
-            filter: voteWinner && voteWinner === 1 ? 'grayscale(1)' : 'none',
-            alignItems: mobileVersion ? 'flex-end' : 'center',
-          }}
-        >
-          <VoteIcon
-            src={voteWinner === 2 ? checkWinnerIcon : checkIcon}
-            width={voteWinner === 2 ? '24px' : '18px'}
-            style={{
-              marginRight: mobileVersion ? '10px' : '0',
-            }}
-          />
-          <span>
-            {' '}
-            {isAnimation && proposingAmount && selectedVote && selectedVote === 1 ? (
-              <CountUp end={votingRoom.totalVotesFor.toNumber() + proposingAmount} separator="," />
-            ) : (
-              addCommas(votingRoom.totalVotesFor.toNumber())
-            )}{' '}
-            <span style={{ fontWeight: 'normal' }}>ABC</span>
-          </span>
-        </VoteBox>
+          voteType={1}
+          mobileVersion={mobileVersion}
+          totalVotes={votingRoom.totalVotesFor.toNumber()}
+          won={voteWinner === 1}
+          selected={isAnimation && selectedVote === 1}
+          proposingAmount={proposingAmount}
+        />
       </VotesChart>
       <VoteGraphBarWrap className={selectedVote || tabletMode ? '' : 'notModal'}>
         <VoteGraphBar
@@ -106,6 +76,43 @@ export function VoteChart({ votingRoom, proposingAmount, selectedVote, isAnimati
   )
 }
 
+type VoteBoxProps = {
+  won: boolean
+  mobileVersion: boolean
+  voteType: number
+  totalVotes: number
+  selected?: boolean
+  proposingAmount?: number
+}
+
+function VoteBox({ won, mobileVersion, voteType, totalVotes, proposingAmount, selected }: VoteBoxProps) {
+  return (
+    <VoteBoxWrapper
+      style={{
+        filter: won ? 'grayscale(1)' : 'none',
+        alignItems: mobileVersion ? (voteType == 1 ? 'flex-start' : 'flex-end') : 'center',
+      }}
+    >
+      <VoteIcon
+        src={voteType === 1 ? (!won ? checkWinnerIcon : checkIcon) : !won ? crossWinnerIcon : crossIcon}
+        width={!won ? '18px' : '14px'}
+        style={{
+          marginLeft: mobileVersion ? '10px' : '0',
+        }}
+      />
+      <span>
+        {' '}
+        {proposingAmount && selected ? (
+          <CountUp end={totalVotes + proposingAmount} separator="," start={totalVotes} duration={2} useEasing={false} />
+        ) : (
+          addCommas(totalVotes)
+        )}{' '}
+        <span style={{ fontWeight: 'normal' }}>ABC</span>
+      </span>
+    </VoteBoxWrapper>
+  )
+}
+
 const Votes = styled.div`
   display: flex;
   flex-direction: column;
@@ -135,7 +142,7 @@ const VotesChart = styled.div`
   }
 `
 
-const VoteBox = styled.div`
+const VoteBoxWrapper = styled.div`
   display: flex;
   flex-direction: column;
   justify-content: space-between;
diff --git a/packages/proposal-components/src/components/VotePropose.tsx b/packages/proposal-components/src/components/VotePropose.tsx
index 920540b..c51929d 100644
--- a/packages/proposal-components/src/components/VotePropose.tsx
+++ b/packages/proposal-components/src/components/VotePropose.tsx
@@ -12,7 +12,6 @@ export interface VoteProposingProps {
 
 export function VotePropose({ availableAmount, proposingAmount, setProposingAmount }: VoteProposingProps) {
   const [inputFocused, setInputFocused] = useState(false)
-  const disabled = useMemo(() => availableAmount === 0, [availableAmount])
   const step = useMemo(
     () => (availableAmount < 100 ? 1 : 10 ** (Math.floor(Math.log10(availableAmount)) - 2)),
     [availableAmount]
@@ -57,9 +56,10 @@ export function VotePropose({ availableAmount, proposingAmount, setProposingAmou
           value={proposingAmount}
           onChange={sliderChange}
           style={{
-            background: disabled
-              ? '#EDF1FF'
-              : `linear-gradient(90deg, #0F3595 0% ${progress},  #EDF1FF ${progress} 100%)`,
+            background:
+              availableAmount === 0
+                ? '#EDF1FF'
+                : `linear-gradient(90deg, #0F3595 0% ${progress},  #EDF1FF ${progress} 100%)`,
           }}
         />
       </VoteProposingRangeWrap>