From 3c49bcd6d0ecf92ef74f6ba9910b6fc783e8c395 Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Wed, 5 Aug 2020 17:05:04 +1000
Subject: [PATCH] Fix flicker in dice total

---
 src/components/dice/DiceResults.js | 31 +++++++++++++++---------------
 src/helpers/dice.js                | 10 ++++++++++
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/components/dice/DiceResults.js b/src/components/dice/DiceResults.js
index 7ce4a2d..0bac0e2 100644
--- a/src/components/dice/DiceResults.js
+++ b/src/components/dice/DiceResults.js
@@ -4,30 +4,31 @@ import { Flex, Text, Button, IconButton } from "theme-ui";
 import ClearDiceIcon from "../../icons/ClearDiceIcon";
 import RerollDiceIcon from "../../icons/RerollDiceIcon";
 
+import { getDiceRollTotal } from "../../helpers/dice";
+
 const maxDiceRollsShown = 6;
 
 function DiceResults({ diceRolls, onDiceClear, onDiceReroll }) {
   const [isExpanded, setIsExpanded] = useState(false);
 
-  if (
-    diceRolls.map((dice) => dice.roll).includes("unknown") ||
-    diceRolls.length === 0
-  ) {
+  if (diceRolls.length === 0) {
     return null;
   }
 
   let rolls = [];
   if (diceRolls.length > 1) {
-    rolls = diceRolls.map((dice, index) => (
-      <React.Fragment key={index}>
-        <Text variant="body2" as="p" color="hsl(210, 50%, 96%)">
-          {dice.roll}
-        </Text>
-        <Text variant="body2" as="p" color="grey">
-          {index === diceRolls.length - 1 ? "" : "+"}
-        </Text>
-      </React.Fragment>
-    ));
+    rolls = diceRolls
+      .filter((dice) => dice.roll !== "unknown")
+      .map((dice, index) => (
+        <React.Fragment key={index}>
+          <Text variant="body2" as="p" color="hsl(210, 50%, 96%)">
+            {dice.roll}
+          </Text>
+          <Text variant="body2" as="p" color="grey">
+            {index === diceRolls.length - 1 ? "" : "+"}
+          </Text>
+        </React.Fragment>
+      ));
   }
 
   return (
@@ -60,7 +61,7 @@ function DiceResults({ diceRolls, onDiceClear, onDiceReroll }) {
           sx={{ fontSize: 5, userSelect: "none" }}
           mb={diceRolls.length === 1 ? "24px" : 0}
         >
-          {diceRolls.reduce((accumulator, dice) => accumulator + dice.roll, 0)}
+          {getDiceRollTotal(diceRolls)}
         </Text>
         {rolls.length > maxDiceRollsShown ? (
           <Button
diff --git a/src/helpers/dice.js b/src/helpers/dice.js
index 00f9450..2093148 100644
--- a/src/helpers/dice.js
+++ b/src/helpers/dice.js
@@ -41,3 +41,13 @@ export function getDiceRoll(dice) {
   }
   return { type: dice.type, roll: number };
 }
+
+export function getDiceRollTotal(diceRolls) {
+  return diceRolls.reduce((accumulator, dice) => {
+    if (dice.roll === "unknown") {
+      return accumulator;
+    } else {
+      return accumulator + dice.roll;
+    }
+  }, 0);
+}