fix: api error page (chrisleekr#556)

TomXiaoYZ · Dec 22, 2022 · 8ed5fcc · 8ed5fcc
1 parent d987a09
commit 8ed5fcc
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/public/js/App.js b/public/js/App.js
@@ -49,7 +49,7 @@ class App extends React.Component {
       selectedSortOption: {
         sortBy: 'default',
         sortByDesc: false,
-        hideInactive: false,
+        hideInactive: false
       },
       searchKeyword: '',
       isLoaded: false,
@@ -138,7 +138,7 @@ class App extends React.Component {
       searchKeyword: this.state.searchKeyword,
       sortBy: this.state.selectedSortOption.sortBy,
       sortByDesc: this.state.selectedSortOption.sortByDesc,
-      hideInactive: this.state.selectedSortOption.hideInactive,
+      hideInactive: this.state.selectedSortOption.hideInactive
     });
   }
 
@@ -319,7 +319,7 @@ class App extends React.Component {
     let selectedSortOption = {
       sortBy: 'default',
       sortByDesc: false,
-      hideInactive: false,
+      hideInactive: false
     };
 
     try {
@@ -328,7 +328,7 @@ class App extends React.Component {
       ) || {
         sortBy: 'default',
         sortByDesc: false,
-        hideInactive: false,
+        hideInactive: false
       };
     } catch (e) {}
 
@@ -377,17 +377,21 @@ class App extends React.Component {
       return <AppLoading />;
     }
 
-    if (this.isAccountLoaded() === false) {
-      return <APIError />;
-    }
-
     if (this.isLocked()) {
       return <LockScreen />;
     }
 
-    const activeSymbols = (selectedSortOption.hideInactive) ?
-        symbols.filter( s => s.symbolConfiguration.buy.enabled || s.symbolConfiguration.sell.enabled )
-        : symbols
+    if (this.isAccountLoaded() === false) {
+      return <APIError />;
+    }
+
+    const activeSymbols = selectedSortOption.hideInactive
+      ? symbols.filter(
+          s =>
+            s.symbolConfiguration.buy.enabled ||
+            s.symbolConfiguration.sell.enabled
+        )
+      : symbols;
 
     const coinWrappers = activeSymbols.map((symbol, index) => {
       return (
@@ -487,8 +491,8 @@ class App extends React.Component {
                 totalProfitAndLoss={totalProfitAndLoss}
               />
               <OrderStats
-                  orderStats={orderStats}
-                  selectedSortOption={selectedSortOption}
+                orderStats={orderStats}
+                selectedSortOption={selectedSortOption}
               />
             </div>
             <Pagination>{paginationItems}</Pagination>