Merge pull request #30

fix(networth): chart initializing multiple times resulting in weird animation

app/templates/cotton/ui/transactions_action_bar.html

@@ -70,27 +70,26 @@
                     append amountValue to flatAmountValues
 
                     if not isNaN(amountValue)
-                      set flatTotal to flatTotal + (amountValue * 100)
+                      set flatTotal to math.chain(flatTotal).add(amountValue)
 
                       if transaction match .income
                         append amountValue to realAmountValues
-                        set realTotal to realTotal + (amountValue * 100)
+                        set realTotal to math.chain(realTotal).add(amountValue)
                       else
                         append -amountValue to realAmountValues
-                        set realTotal to realTotal - (amountValue * 100)
+                        set realTotal to math.chain(realTotal).subtract(amountValue)
                       end
                     end
                   end
-
-                  set realTotal to realTotal / 100
-                  set flatTotal to flatTotal / 100
                   
-                  put realTotal.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #real-total-front's innerText
-                  put realTotal.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #calc-menu-real-total's innerText
-                  put flatTotal.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #calc-menu-flat-total's innerText
+                  set mean to flatTotal.divide(flatAmountValues.length)
+
+                  put realTotal.value.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #real-total-front's innerText
+                  put realTotal.value.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #calc-menu-real-total's innerText
+                  put flatTotal.value.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #calc-menu-flat-total's innerText
                   put Math.max.apply(Math, realAmountValues).toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #calc-menu-max's innerText
                   put Math.min.apply(Math, realAmountValues).toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #calc-menu-min's innerText
-                  put (flatTotal / flatAmountValues.length).toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #calc-menu-mean's innerText
+                  put mean.value.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #calc-menu-mean's innerText
                   put flatAmountValues.length.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #calc-menu-count's innerText
                 end"
         >

app/templates/includes/tools/calculator.html

@@ -69,8 +69,7 @@
                 then call math.evaluate(expr)
                 if result exists and result is a Number
                   js(result)
-                    return result.toString().replace(new RegExp(',|\\.', 'g'),
-                                                                   match => match === '.' ? window.decimalSeparator : window.argSeparator)
+                    return result.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40})
                   end
                   then set localizedResult to it
                   set #calculator-result.innerText to localizedResult

app/templates/net_worth/net_worth.html

@@ -9,7 +9,7 @@
 {% block title %}{% if type == "current" %}{% translate 'Current Net Worth' %}{% else %}{% translate 'Projected Net Worth' %}{% endif %}{% endblock %}
 
 {% block content %}
-  <div class="container px-md-3 py-3" _="on load call initializeAccountChart() then initializeCurrencyChart()">
+  <div class="container px-md-3 py-3" _="init call initializeAccountChart() then initializeCurrencyChart() end">
     <div class="row gx-xl-4 gy-3 mb-4">
       <div class="col-12 col-xl-5">
         <div class="row row-cols-1 g-4">