From 92a2bb4d320a069c19caebdfdf59bc75047e6367 Mon Sep 17 00:00:00 2001
From: Kukks <evilkukka@gmail.com>
Date: Wed, 2 Jan 2019 12:04:35 +0100
Subject: [PATCH] fixes to computed goal result

---
 BTCPayServer/Crowdfund/CrowdfundHubStreamer.cs      | 12 ++++++------
 .../Views/AppsPublic/Crowdfund/VueCrowdfund.cshtml  | 13 +++++++------
 BTCPayServer/wwwroot/crowdfund/app.js               |  4 +++-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/BTCPayServer/Crowdfund/CrowdfundHubStreamer.cs b/BTCPayServer/Crowdfund/CrowdfundHubStreamer.cs
index b7a5aaeeb..f9eb5ccf8 100644
--- a/BTCPayServer/Crowdfund/CrowdfundHubStreamer.cs
+++ b/BTCPayServer/Crowdfund/CrowdfundHubStreamer.cs
@@ -131,12 +131,12 @@ namespace BTCPayServer.Hubs
             RateFetcher rateFetcher, RateRules rateRules)
         {
             decimal result = 0;
-            
-            var groupingByCurrency = invoices.GroupBy(entity => entity.ProductInformation.Currency);
+
+            var stats = GetCurrentContributionAmountStats(invoices);
 
             var ratesTask = rateFetcher.FetchRates(
-                groupingByCurrency
-                    .Select((entities) => new CurrencyPair(entities.Key, primaryCurrency))
+                stats.Keys
+                    .Select((x) => new CurrencyPair(PaymentMethodId.Parse(x).CryptoCode, primaryCurrency))
                     .ToHashSet(), 
                 rateRules);
 
@@ -148,8 +148,8 @@ namespace BTCPayServer.Hubs
                     var tResult = await rateTask.Value;
                     var rate = tResult.BidAsk?.Bid;
                     if (rate == null) return;
-                    var currencyGroup = groupingByCurrency.Single(entities => entities.Key == rateTask.Key.Left);
-                    result += currencyGroup.Sum(entity => entity.ProductInformation.Price / rate.Value);
+                    var currencyGroup = stats[rateTask.Key.Left];
+                    result += currencyGroup / rate.Value;
                 }));
             }
 
diff --git a/BTCPayServer/Views/AppsPublic/Crowdfund/VueCrowdfund.cshtml b/BTCPayServer/Views/AppsPublic/Crowdfund/VueCrowdfund.cshtml
index 11302b061..b90697401 100644
--- a/BTCPayServer/Views/AppsPublic/Crowdfund/VueCrowdfund.cshtml
+++ b/BTCPayServer/Views/AppsPublic/Crowdfund/VueCrowdfund.cshtml
@@ -93,7 +93,7 @@
                 </div>
                 
                 <b-tooltip target="raised-amount" >
-                    <ul class="p-0">
+                    <ul class="p-0 text-uppercase">
                         <li v-for="stat of paymentStats" style="list-style-type: none">
                             {{stat.label}} {{stat.value}}
                         </li>
@@ -158,6 +158,7 @@
             </div>
             <div class="card-footer text-muted d-flex" v-if="srvModel.animationsEnabled || srvModel.soundsEnabled">
               
+                <div class="align-self-end pr-4">Updated {{lastUpdated}}</div>
                 <div class="form-check mx-1"  v-if="srvModel.animationsEnabled || animation">
                     <input class="form-check-input" type="checkbox" id="cbAnime" v-model="animation">
                     <label class="form-check-label" for="cbAnime">
@@ -165,11 +166,11 @@
                     </label>
                 </div>
                 <div class="form-check mx-1"  v-if="srvModel.soundsEnabled|| sound">
-                        <input class="form-check-input" type="checkbox"  id="cbSounds" v-model="sound">
-                        <label class="form-check-label" for="cbSounds">
-                            Sounds
-                        </label>
-                    </div>
+                    <input class="form-check-input" type="checkbox"  id="cbSounds" v-model="sound">
+                    <label class="form-check-label" for="cbSounds">
+                        Sounds
+                    </label>
+                </div>
             </div>
         </div>
     </div>
diff --git a/BTCPayServer/wwwroot/crowdfund/app.js b/BTCPayServer/wwwroot/crowdfund/app.js
index 0744c3b06..162d39e0e 100644
--- a/BTCPayServer/wwwroot/crowdfund/app.js
+++ b/BTCPayServer/wwwroot/crowdfund/app.js
@@ -82,7 +82,8 @@ addLoadEvent(function (ev) {
                 startDiff: "",
                 active: true,
                 animation: true, 
-                sound: true
+                sound: true,
+                lastUpdated:""
                 
             }
         },
@@ -160,6 +161,7 @@ addLoadEvent(function (ev) {
                     var mDiffS =  moment(this.srvModel.startDate).diff(moment(), "seconds");
                     this.startDiff =  mDiffD > 0? mDiffD + " Days" : mDiffH> 0? mDiffH + " Hours" : mDiffM> 0? mDiffM+ " Minutes" : mDiffS> 0? mDiffS + " Seconds": "";
                 }
+                this.lastUpdated = moment(this.srvModel.info.lastUpdated).calendar();
                 this.active = this.started && !this.ended;
                 setTimeout(this.updateComputed, 1000);
             },