chore: merge staging into master (#793)

ArdentHQ · Feb 15, 2024 · a2e3d55 · a2e3d55
2 parents c55f5b9 + 2b7e406
commit a2e3d55
Show file tree

Hide file tree

Showing 31 changed files with 257 additions and 472 deletions.
diff --git a/app/Console/Commands/CacheCurrenciesHistory.php b/app/Console/Commands/CacheCurrenciesHistory.php
diff --git a/app/Console/Commands/CacheDevelopmentData.php b/app/Console/Commands/CacheDevelopmentData.php
@@ -32,7 +32,6 @@ public function handle(): void
             'explorer:cache-prices',
             'explorer:cache-volume',
             'explorer:cache-currencies-data',
-            'explorer:cache-currencies-history --no-delay',
             'explorer:cache-delegate-aggregates',
             'explorer:cache-delegate-performance',
             'explorer:cache-delegate-productivity',

diff --git a/app/Console/Commands/CacheDevelopmentPricing.php b/app/Console/Commands/CacheDevelopmentPricing.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Artisan;
+
+final class CacheDevelopmentPricing extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'explorer:cache-development-pricing';
+
+    /**
+     * The console command description.
+     *
+     * @var string|null
+     */
+    protected $description = 'Cache all pricing commands';
+
+    public function handle(): void
+    {
+        collect([
+            'explorer:cache-currencies-data',
+            'explorer:cache-prices',
+        ])->map(fn (string $command) => Artisan::call($command));
+    }
+}
diff --git a/app/Console/Commands/CachePrices.php b/app/Console/Commands/CachePrices.php
@@ -74,7 +74,7 @@ public function handle(
                 }
 
                 if ($periodPrices->isEmpty()) {
-                    break 2;
+                    continue;
                 }
 
                 $crypto->setPrices($currency.'.'.$period, $periodPrices);

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -9,7 +9,6 @@
 use App\Console\Commands\CacheAnnualStatistics;
 use App\Console\Commands\CacheBlocks;
 use App\Console\Commands\CacheCurrenciesData;
-use App\Console\Commands\CacheCurrenciesHistory;
 use App\Console\Commands\CacheDelegateAggregates;
 use App\Console\Commands\CacheDelegatePerformance;
 use App\Console\Commands\CacheDelegateProductivity;
@@ -57,8 +56,6 @@ protected function schedule(Schedule $schedule)
 
         $schedule->command(CacheCurrenciesData::class)->everyMinute()->withoutOverlapping();
 
-        $schedule->command(CacheCurrenciesHistory::class)->hourly();
-
         $schedule->command(CacheVolume::class)->hourly();
 
         $schedule->command(CacheDelegateWallets::class)->everyTenMinutes();

diff --git a/app/DTO/Statistics/MarketDataPriceStatistics.php b/app/DTO/Statistics/MarketDataPriceStatistics.php
@@ -111,6 +111,15 @@ public function yearHigh(): ?string
      */
     private function formatCurrency($value): string
     {
-        return NumberFormatter::currencyWithDecimals($value, Settings::currency(), 2);
+        return NumberFormatter::currencyWithDecimals($value, Settings::currency(), $this->decimals());
+    }
+
+    private function decimals(): int
+    {
+        if (NumberFormatter::isFiat(Settings::currency())) {
+            return 2;
+        }
+
+        return 8;
     }
 }
diff --git a/app/Http/Livewire/Navbar/PriceTicker.php b/app/Http/Livewire/Navbar/PriceTicker.php
@@ -34,8 +34,16 @@ public function mount(): void
 
     public function setValues(): void
     {
-        $this->isAvailable = (new NetworkStatusBlockCache())->getIsAvailable(Network::currency(), Settings::currency());
-        $this->to          = Settings::currency();
+        $cache = new NetworkStatusBlockCache();
+        foreach (config('currencies') as $currency) {
+            if (! $cache->getIsAvailable(Network::currency(), $currency['currency'])) {
+                continue;
+            }
+
+            $this->isAvailable = true;
+        }
+
+        $this->to = Settings::currency();
 
         $this->dispatchBrowserEvent('has-loaded-price-data');
     }

diff --git a/app/Jobs/CacheCurrenciesHistory.php b/app/Jobs/CacheCurrenciesHistory.php
diff --git a/app/Services/Cache/NetworkStatusBlockCache.php b/app/Services/Cache/NetworkStatusBlockCache.php
@@ -7,25 +7,12 @@
 use App\Contracts\Cache as Contract;
 use App\Services\Cache\Concerns\ManagesCache;
 use Illuminate\Cache\TaggedCache;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 
 final class NetworkStatusBlockCache implements Contract
 {
     use ManagesCache;
 
-    public function getHistoricalHourly(string $source, string $target): ?Collection
-    {
-        return $this->get(sprintf('historical-hourly/%s/%s', $source, $target));
-    }
-
-    public function setHistoricalHourly(string $source, string $target, ?Collection $historical): ?Collection
-    {
-        $this->put(sprintf('historical-hourly/%s/%s', $source, $target), $historical);
-
-        return $historical;
-    }
-
     public function getPrice(string $source, string $target): ?float
     {
         $price = $this->get(sprintf('price/%s/%s', $source, $target));

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -23,7 +23,6 @@ php artisan explorer:cache-transactions
 php artisan explorer:cache-prices
 php artisan explorer:cache-volume
 php artisan explorer:cache-currencies-data
-php artisan explorer:cache-currencies-history --no-delay
 php artisan explorer:cache-delegate-aggregates
 php artisan explorer:cache-delegate-performance
 php artisan explorer:cache-delegate-productivity

diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
         "production": "mix --production"
     },
     "devDependencies": {
-        "alpinejs": "^3.13.3",
+        "alpinejs": "^3.13.5",
         "autoprefixer": "10.4.5",
         "body-scroll-lock": "^4.0.0-beta.0",
         "chart.js": "^3.9.1",
@@ -41,6 +41,6 @@
         "autoprefixer": "10.4.5"
     },
     "dependencies": {
-        "axios": "^1.6.5"
+        "axios": "^1.6.7"
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -33,6 +33,7 @@
                 <file>./app/Http/Kernel.php</file>
                 <!-- Application Code -->
                 <directory suffix=".php">./app/Console/Commands/CacheDevelopmentData.php</directory>
+                <directory suffix=".php">./app/Console/Commands/CacheDevelopmentPricing.php</directory>
                 <directory suffix=".php">./app/Facades</directory>
                 <directory suffix=".php">./app/Models/Scopes</directory>
             </exclude>

diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/vendor.js b/public/js/vendor.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,10 +1,10 @@
 {
-    "/js/app.js": "/js/app.js?id=d0cd079a4a6094e4dd4bcaf3627e1512",
+    "/js/app.js": "/js/app.js?id=a7c3057b59b1b30039dc4f5d3a5d62d9",
     "/js/chart-tooltip.js": "/js/chart-tooltip.js?id=b74d64d41a6d6165abc8a5196bf704ca",
     "/js/clipboard.js": "/js/clipboard.js?id=80d900f861e2aacb0e23e914068d0de9",
     "/js/manifest.js": "/js/manifest.js?id=bf375adc4a6d48ff1f208128c5b5b26f",
-    "/css/app.css": "/css/app.css?id=2cc803a0c1e3d8098caa68ac62e31eb3",
-    "/js/vendor.js": "/js/vendor.js?id=a8afaf722d5b57af63b4a780cd61d61e",
+    "/css/app.css": "/css/app.css?id=31573c3fab41e440131dffd412305b32",
+    "/js/vendor.js": "/js/vendor.js?id=a72f85e73ae564de132d90e38f26c9a6",
     "/images/delegates/header-bg-dark.svg": "/images/delegates/header-bg-dark.svg?id=0fc9d2cfbec09d702832f3bd81fae169",
     "/images/delegates/header-bg-dim.svg": "/images/delegates/header-bg-dim.svg?id=48500cc7f16e42f8f0f07af07b76dead",
     "/images/delegates/header-bg-mobile-dark.svg": "/images/delegates/header-bg-mobile-dark.svg?id=a60884230a85d1b8bb5f35e9a65f81cc",

diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
@@ -3,48 +3,48 @@
 declare(strict_types=1);
 
 return [
-    'ardent'                  => 'Ardent',
-    'address'                 => 'Address',
-    'beta_uppercase'          => 'BETA',
-    'optional'                => 'Optional',
-    'or'                      => 'or',
-    'arkscan'                 => 'ARKScan',
-    'scan'                    => 'Scan',
-    'height'                  => 'Height',
-    'network'                 => 'Network',
-    'current_supply'          => 'Current Supply',
-    'not_available'           => 'Not Available',
-    'price'                   => 'Price',
-    'market_cap'              => 'Market Cap',
-    'verified_address'        => 'Verified Address',
-    'exchange'                => 'Exchange',
-    'reload'                  => 'Reload',
-    'confirmed'               => 'Confirmed',
-    'see_all'                 => 'See all',
-    'wallet_not_found'        => '<span class="bg-theme-warning-100">:0</span> has no balance. <br/> <span class="text-base font-normal">Return to this page after the address has received a transaction.</span>',
-    'fiat_excluding_itself'   => 'Excluding :amount sent to itself',
-    'more_details'            => 'For more :transactionType details',
-    'learn_more'              => 'Learn more',
-    'confirmations'           => ':count Confirmation|:count Confirmations',
-    'confirmations_only'      => 'Confirmations',
-    'market_data_by'          => 'Market Data by',
-    'arkvault'                => 'ARKVault',
-    'select_theme'            => 'Select Theme',
-    'select_network'          => 'Select Network',
-    'na'                      => 'N/A',
-    'all'                     => 'All',
-    'overview'                => 'Overview',
-    'view'                    => 'View',
-    'coming_soon'             => 'Coming Soon',
-    'select_all'              => 'Select All',
-    'success'                 => 'Success',
-    'information'             => 'Information',
-    'error'                   => 'Error',
-    'warning'                 => 'Warning',
-    'custom'                  => 'Custom',
-    'x_of_y'                  => ':0 of :1',
-    'filter'                  => 'Filter',
-    'now'                     => 'Now',
+    'ardent'              => 'Ardent',
+    'address'             => 'Address',
+    'beta_uppercase'      => 'BETA',
+    'optional'            => 'Optional',
+    'or'                  => 'or',
+    'arkscan'             => 'ARKScan',
+    'scan'                => 'Scan',
+    'height'              => 'Height',
+    'network'             => 'Network',
+    'current_supply'      => 'Current Supply',
+    'not_available'       => 'Not Available',
+    'price'               => 'Price',
+    'market_cap'          => 'Market Cap',
+    'verified_address'    => 'Verified Address',
+    'exchange'            => 'Exchange',
+    'reload'              => 'Reload',
+    'confirmed'           => 'Confirmed',
+    'see_all'             => 'See all',
+    'wallet_not_found'    => '<span class="bg-theme-warning-100">:0</span> has no balance. <br/> <span class="text-base font-normal">Return to this page after the address has received a transaction.</span>',
+    'fiat_excluding_self' => 'Excluding :amount sent to self',
+    'more_details'        => 'For more :transactionType details',
+    'learn_more'          => 'Learn more',
+    'confirmations'       => ':count Confirmation|:count Confirmations',
+    'confirmations_only'  => 'Confirmations',
+    'market_data_by'      => 'Market Data by',
+    'arkvault'            => 'ARKVault',
+    'select_theme'        => 'Select Theme',
+    'select_network'      => 'Select Network',
+    'na'                  => 'N/A',
+    'all'                 => 'All',
+    'overview'            => 'Overview',
+    'view'                => 'View',
+    'coming_soon'         => 'Coming Soon',
+    'select_all'          => 'Select All',
+    'success'             => 'Success',
+    'information'         => 'Information',
+    'error'               => 'Error',
+    'warning'             => 'Warning',
+    'custom'              => 'Custom',
+    'x_of_y'              => ':0 of :1',
+    'filter'              => 'Filter',
+    'now'                 => 'Now',
 
     'navbar' => [
         'search_placeholder' => 'Address / Tx ID / Block ID',

diff --git a/resources/lang/en/tables.php b/resources/lang/en/tables.php
@@ -20,6 +20,7 @@
         'contract'   => 'Contract',
         'multiple'   => 'Multiple',
         'address'    => 'Address',
+        'return'     => 'Return',
 
         'amount_no_currency' => 'Amount',
 

diff --git a/resources/views/components/general/amount-fiat-tooltip.blade.php b/resources/views/components/general/amount-fiat-tooltip.blade.php
@@ -24,7 +24,7 @@
 
 <span {{ $attributes->merge(['class' => $class]) }}>
     @if($amountForItself !== null && $amountForItself > 0)
-        <span class="fiat-hint" data-tippy-content="{{ trans('general.fiat_excluding_itself', [
+        <span class="fiat-hint" data-tippy-content="{{ trans('general.fiat_excluding_self', [
             'amount' => ExplorerNumberFormatter::currency($amountForItself, Network::currency())
         ]) }}">
             <x-ark-icon name="hint-small" size="xs" />