Fix: LCFS BUG - Navigating directly to organization detail errors #1586

bcgov · Jan 8, 2025 · f876f05 · f876f05
1 parent cfc3bc7
commit f876f05
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/frontend/src/assets/locales/en/fuelCode.json b/frontend/src/assets/locales/en/fuelCode.json
@@ -31,7 +31,7 @@
     "company": "Company",
     "contactName": "Contact name",
     "contactEmail": "Contact email",
-    "carbonIntensity": "Carbon intensity (gCO²e/MJ)",
+    "carbonIntensity": "Carbon intensity (gCO₂e/MJ)",
     "edrms": "EDRMS#",
     "applicationDate": "Application date",
     "approvalDate": "Approval date",

diff --git a/frontend/src/components/Login.jsx b/frontend/src/components/Login.jsx
@@ -188,6 +188,7 @@ export const Login = () => {
                     <BCButton
                       variant="contained"
                       color="primary"
+                      aria-label="Login with BCeID"
                       onClick={() => {
                         keycloak.login({
                           idpHint: IDENTITY_PROVIDERS.BCEID_BUSINESS,
@@ -221,6 +222,7 @@ export const Login = () => {
                     <BCButton
                       variant="outlined"
                       color="white"
+                      aria-label="Login with IDIR"
                       onClick={() => {
                         keycloak.login({
                           idpHint: IDENTITY_PROVIDERS.IDIR,

diff --git a/frontend/src/views/Organizations/ViewOrganization/ViewOrganization.jsx b/frontend/src/views/Organizations/ViewOrganization/ViewOrganization.jsx
@@ -42,12 +42,9 @@ export const ViewOrganization = () => {
     orgID ?? currentUser?.organization?.organizationId
   )
 
-  let orgBalance = {}
-  if (hasRoles(roles.government)) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    orgBalance = useOrganizationBalance(orgID)
-  }
-  const { data: orgBalaceInfo } = orgBalance
+  const { data: orgBalanceInfo } = useOrganizationBalance(
+    orgID ?? currentUser?.organization?.organizationId
+  )
 
   const canEdit = hasRoles(roles.administrator)
   const editButtonRoute = canEdit
@@ -174,9 +171,9 @@ export const ViewOrganization = () => {
                   <Role roles={[roles.government]}>
                     <BCTypography variant="body4">
                       <strong>{t('org:complianceUnitBalance')}:</strong>{' '}
-                      {orgBalaceInfo?.totalBalance.toLocaleString()} (
+                      {orgBalanceInfo?.totalBalance?.toLocaleString()} (
                       {Math.abs(
-                        orgBalaceInfo?.reservedBalance
+                        orgBalanceInfo?.reservedBalance || 0
                       ).toLocaleString()}
                       )
                     </BCTypography>