From e996f8f5b78a1b17f7c5d0960397a7b5455d1494 Mon Sep 17 00:00:00 2001
From: mikozet <95082155+mikozet@users.noreply.github.com>
Date: Thu, 28 Sep 2023 16:20:56 +0400
Subject: [PATCH] Remove console errors on development (#733)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove console errors on development

* Fix forward ref error

---------

Co-authored-by: Louise Linné <linne.louise@gmail.com>
---
 src/components/ButtonAction.js      |  3 ++-
 src/components/Dialog.js            |  2 +-
 src/components/DialogAddMember.js   |  6 +-----
 src/components/DialogPurple.js      | 10 ++++++++--
 src/components/DialogTrust.js       |  6 +-----
 src/components/DialogTrustRevoke.js |  8 +++-----
 src/views/QRGenerator.js            |  2 +-
 src/views/Validation.js             |  2 +-
 8 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/components/ButtonAction.js b/src/components/ButtonAction.js
index 26f9857c..dad35946 100644
--- a/src/components/ButtonAction.js
+++ b/src/components/ButtonAction.js
@@ -59,7 +59,7 @@ const useStyles = makeStyles((theme) => ({
 
 // eslint-disable-next-line react/display-name
 const ButtonAction = React.forwardRef(
-  ({ className, children, disabled, ...props }) => {
+  ({ className, children, disabled, ...props }, ref) => {
     const classes = useStyles();
 
     return (
@@ -70,6 +70,7 @@ const ButtonAction = React.forwardRef(
           disabled: classes.buttonDisabled,
         }}
         disabled={disabled}
+        ref={ref}
         {...props}
       >
         <Box className={classes.buttonContainer}>
diff --git a/src/components/Dialog.js b/src/components/Dialog.js
index 1c1d6c2e..e22b4c5f 100644
--- a/src/components/Dialog.js
+++ b/src/components/Dialog.js
@@ -37,7 +37,7 @@ const Dialog = ({
         </DialogContentText>
       </DialogContent>
       <DialogActions>
-        <Button autoFocus isPrimary onClick={onConfirm}>
+        <Button autoFocus onClick={onConfirm}>
           {confirmLabel}
         </Button>
         <Button isOutline onClick={onClose}>
diff --git a/src/components/DialogAddMember.js b/src/components/DialogAddMember.js
index 3400794d..a8a23b93 100644
--- a/src/components/DialogAddMember.js
+++ b/src/components/DialogAddMember.js
@@ -29,11 +29,7 @@ const DialogAddMember = ({
       cancelLabel={translate('DialogAddMember.dialogCancel')}
       confirmLabel={confirmLabel}
       open={isOpen}
-      title={
-        <Typography classes={{ root: 'h4_link_white' }} variant="h4">
-          {translate('DialogAddMember.dialogTitle', { username })}
-        </Typography>
-      }
+      title={translate('DialogAddMember.dialogTitle', { username })}
       onClose={handleClose}
       onConfirm={onConfirm}
     >
diff --git a/src/components/DialogPurple.js b/src/components/DialogPurple.js
index 26665453..eee64a37 100644
--- a/src/components/DialogPurple.js
+++ b/src/components/DialogPurple.js
@@ -1,4 +1,4 @@
-import { Box, Dialog, DialogTitle } from '@mui/material';
+import { Box, Dialog, DialogTitle, Typography } from '@mui/material';
 import makeStyles from '@mui/styles/makeStyles';
 import PropTypes from 'prop-types';
 import React from 'react';
@@ -41,7 +41,13 @@ const DialogPurple = ({
   return (
     <Dialog classes={classes} onClose={onClose} {...otherProps} maxWidth="lg">
       <DialogTitle align="center" classes={titleClasses}>
-        {title}
+        <Typography
+          classes={{ root: 'h4_link_white' }}
+          component="span"
+          variant="h4"
+        >
+          {title}
+        </Typography>
       </DialogTitle>
       {children}
       <Box pb={2} pt={2}>
diff --git a/src/components/DialogTrust.js b/src/components/DialogTrust.js
index 01f5a897..1427eb0e 100644
--- a/src/components/DialogTrust.js
+++ b/src/components/DialogTrust.js
@@ -78,11 +78,7 @@ const DialogTrust = ({
       confirmLabel={translate('DialogTrust.dialogTrustConfirm')}
       id="trust"
       open={isOpen}
-      title={
-        <Typography classes={{ root: 'h4_link_white' }} variant="h4">
-          {translate('DialogTrust.dialogTrustTitle', { username })}
-        </Typography>
-      }
+      title={translate('DialogTrust.dialogTrustTitle', { username })}
       onClose={handleTrustClose}
       onConfirm={handleTrust}
     >
diff --git a/src/components/DialogTrustRevoke.js b/src/components/DialogTrustRevoke.js
index 88c62b44..5ce68648 100644
--- a/src/components/DialogTrustRevoke.js
+++ b/src/components/DialogTrustRevoke.js
@@ -76,11 +76,9 @@ const DialogTrustRevoke = ({
       confirmLabel={translate('DialogTrustRevoke.dialogRevokeTrustConfirm')}
       id="revoke-trust"
       open={isOpen}
-      title={
-        <Typography classes={{ root: 'h4_link_white' }} variant="h4">
-          {translate('DialogTrustRevoke.dialogRevokeTrustTitle', { username })}
-        </Typography>
-      }
+      title={translate('DialogTrustRevoke.dialogRevokeTrustTitle', {
+        username,
+      })}
       onClose={handleRevokeTrustClose}
       onConfirm={handleRevokeTrust}
     >
diff --git a/src/views/QRGenerator.js b/src/views/QRGenerator.js
index d1762147..3e9f4bbc 100644
--- a/src/views/QRGenerator.js
+++ b/src/views/QRGenerator.js
@@ -115,7 +115,7 @@ const QRGenerator = () => {
             </ButtonShare>
           </Box>
           <Box mb={1} mt={2}>
-            <Button autoFocus fullWidth isPrimary onClick={handleHideQR}>
+            <Button autoFocus fullWidth onClick={handleHideQR}>
               {translate('QRGenerator.dialogClose')}
             </Button>
           </Box>
diff --git a/src/views/Validation.js b/src/views/Validation.js
index 650763b6..76b56100 100644
--- a/src/views/Validation.js
+++ b/src/views/Validation.js
@@ -101,7 +101,7 @@ const Validation = () => {
 
   const dialogContentFooter = () => {
     return (
-      <ButtonShare fullWidth isPrimary text={shareText} url={shareLink}>
+      <ButtonShare fullWidth text={shareText} url={shareLink}>
         {translate('Validation.buttonShareProfileLink')}
       </ButtonShare>
     );