fix: price stat chart refresh (#754)

ArkEcosystem · May 28, 2021 · a21b061 · a21b061
1 parent 9057e0e
commit a21b061
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 12 deletions.
diff --git a/app/Http/Livewire/PriceStats.php b/app/Http/Livewire/PriceStats.php
@@ -15,6 +15,9 @@ final class PriceStats extends Component
 {
     public bool $placeholder = false;
 
+    /** @phpstan-ignore-next-line */
+    protected $listeners = ['refreshNetworkStatusBlock' => '$refresh'];
+
     public function mount(bool $placeholder = false) : void
     {
         $this->placeholder = $placeholder;

diff --git a/app/Services/CryptoCompare.php b/app/Services/CryptoCompare.php
@@ -66,7 +66,17 @@ public static function historicalHourly(string $source, string $target, int $lim
 
             return collect($result)
                 ->groupBy(fn ($day) => Carbon::createFromTimestamp($day['time'])->format($format))
-                ->mapWithKeys(fn ($transactions, $day) => [$day => NumberFormatter::number($transactions->sum('close'))]);
+                ->mapWithKeys(function ($transactions, $day) use ($target): array {
+                    if (ExchangeRate::isFiat($target)) {
+                        return [
+                            $day => NumberFormatter::number($transactions->sum('close')),
+                        ];
+                    }
+
+                    return [
+                        $day => NumberFormatter::currency($transactions->sum('close'), '', 8),
+                    ];
+                });
         });
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,6 +1,6 @@
 {
     "/js/manifest.js": "/js/manifest.js?id=7db827d654313dce4250",
-    "/js/app.js": "/js/app.js?id=d829404a24aac8f97aa9",
+    "/js/app.js": "/js/app.js?id=d32d2105a320cbd75b45",
     "/css/app.css": "/css/app.css?id=00959284b45a387c419a",
     "/js/vendor.js": "/js/vendor.js?id=d2021daf9ac3eabd5cad",
     "/js/chart.js": "/js/chart.js?id=34ccf97ba22038c7b06d",

diff --git a/resources/js/price-chart.js b/resources/js/price-chart.js
@@ -6,9 +6,10 @@ const PriceChart = (
     darkMode,
     time
 ) => {
-    // The `0.02` is to left some space to prevent the border to be cropped
-    const maxValue = Math.max.apply(Math, values) + 0.02;
-    const minValue = Math.min.apply(Math, values) - 0.02;
+    // The margin is used to not cut the line at the top/bottom
+    const margin = Math.max.apply(Math, values) * 0.01;
+    const maxValue = Math.max.apply(Math, values) + margin;
+    const minValue = Math.min.apply(Math, values) - margin;
 
     return {
         time: time,

diff --git a/resources/views/livewire/price-stats.blade.php b/resources/views/livewire/price-stats.blade.php
@@ -35,6 +35,7 @@ class="flex flex-grow justify-between ml-3 h-full"
 
     <div class="hidden flex-grow justify-end lg:flex" >
         <div
+            wire:key="{{ Settings::currency() }}"
             class="ml-6"
             style="width: 120px; height: 40px;"
             x-data="PriceChart(