From 49ea028805d75dba06cbcd830bb00e5b725ebd5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= <sergiodiassalgado@gmail.com>
Date: Fri, 11 Jun 2021 01:19:04 +0100
Subject: [PATCH] fix: add loading flag to commission list

---
 new-lamassu-admin/src/pages/Commissions/Commissions.js      | 6 +++---
 .../src/pages/Commissions/components/CommissionsList.js     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/new-lamassu-admin/src/pages/Commissions/Commissions.js b/new-lamassu-admin/src/pages/Commissions/Commissions.js
index 8aa10a29..d52e9d09 100644
--- a/new-lamassu-admin/src/pages/Commissions/Commissions.js
+++ b/new-lamassu-admin/src/pages/Commissions/Commissions.js
@@ -49,7 +49,7 @@ const Commissions = ({ name: SCREEN_KEY }) => {
   const classes = useStyles()
   const [showMachines, setShowMachines] = useState(false)
   const [error, setError] = useState(null)
-  const { data } = useQuery(GET_DATA)
+  const { data, loading } = useQuery(GET_DATA)
   const [saveConfig] = useMutation(SAVE_CONFIG, {
     refetchQueries: () => ['getData'],
     onError: error => setError(error)
@@ -118,7 +118,7 @@ const Commissions = ({ name: SCREEN_KEY }) => {
         iconClassName={classes.listViewButton}
       />
 
-      {!showMachines && (
+      {!showMachines && !loading && (
         <CommissionsDetails
           config={config}
           locale={localeConfig}
@@ -130,7 +130,7 @@ const Commissions = ({ name: SCREEN_KEY }) => {
           classes={classes}
         />
       )}
-      {showMachines && (
+      {showMachines && !loading && (
         <CommissionsList
           config={config}
           localeConfig={localeConfig}
diff --git a/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js b/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js
index 94437549..b46d6b34 100644
--- a/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js
+++ b/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js
@@ -98,7 +98,7 @@ const CommissionsList = memo(
     const [coinFilter, setCoinFilter] = useState(SHOW_ALL)
     const [orderProp, setOrderProp] = useState(ORDER_OPTIONS[0])
 
-    const coins = R.prop('cryptoCurrencies', localeConfig)
+    const coins = R.prop('cryptoCurrencies', localeConfig) ?? []
 
     const getMachineCoins = deviceId => {
       const override = R.prop('overrides', localeConfig)?.find(