fix

enjin · Oct 31, 2023 · e13c7cc · e13c7cc
1 parent f693e8a
commit e13c7cc
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/resources/js/components/App.vue b/resources/js/components/App.vue
@@ -33,7 +33,7 @@ const router = useRouter();
 const canaryHost = computed(() => appStore.config.network === 'canary');
 
 (() => {
-    if (window.bootstrap.name) {
+    if (window.bootstrap?.name) {
         return;
     }
 

diff --git a/resources/js/components/SideNavbar.vue b/resources/js/components/SideNavbar.vue
@@ -49,7 +49,7 @@ const navigations = computed(() => useAppStore().navigations);
 const canaryHost = computed(() => useAppStore().config.network === 'canary');
 
 const pageTitle = () => {
-    if (window.bootstrap.name) {
+    if (window.bootstrap?.name) {
         return window.bootstrap.name;
     }
 

diff --git a/resources/js/components/UserNavbar.vue b/resources/js/components/UserNavbar.vue
@@ -67,7 +67,7 @@ const navigations = computed(() => appStore.navigations);
 const canaryHost = computed(() => useAppStore().config.network === 'canary');
 
 const pageTitle = () => {
-    if (window.bootstrap.name) {
+    if (window.bootstrap?.name) {
         return window.bootstrap.name;
     }
 

diff --git a/resources/js/components/WalletConnectButton.vue b/resources/js/components/WalletConnectButton.vue
@@ -74,6 +74,8 @@ const walletName = computed(() => {
     } else if (connectionStore.provider === 'polkadot.js') {
         return 'Polkadot.JS';
     }
+
+    return '';
 });
 
 const walletSession = computed(() => connectionStore.wallet);

diff --git a/resources/js/components/pages/Settings.vue b/resources/js/components/pages/Settings.vue
@@ -287,4 +287,12 @@ watch(
         }
     }
 );
+
+(() => {
+    setTimeout(() => {
+        if (loading.value) {
+            loading.value = false;
+        }
+    }, 2000);
+})();
 </script>
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
@@ -15,7 +15,7 @@
     <script>
         global = globalThis
         window.__dynamic_base__ = '/vendor/platform-ui/build';
-        window.bootstrap = { name: "{{ env('APP_NAME') }}", network: "{{ env('NETWORK') }}"  url: window.location.origin, daemon: "{{ Enjin\Platform\Support\Account::daemon()['public_key'] }}" }
+        window.bootstrap = { name: "{{ env('APP_NAME') }}", network: "{{ env('NETWORK') }}" , url: window.location.origin, daemon: "{{ Enjin\Platform\Support\Account::daemon()['public_key'] }}" }
     </script>
 
 	@vite('resources/js/app.ts', 'vendor/platform-ui/build')