Fix: Simplified 'if' statement and changed naming

Author: Andrew718PLTS

src/components/buttons/3DButton.tsx

@@ -35,7 +35,7 @@ export const Button3D = ({
       disabled={isDisabled}
     >
       <span
-        className={`group font-inter outline-offset-4 cursor-pointer ${getSubstrateButtonColor({
+        className={`group font-inter outline-offset-4 cursor-pointer ${getShadowButtonColor({
           isDisabled,
           isWalletConnected,
           isError,
@@ -63,7 +63,7 @@ export const Button3D = ({
   )
 }
 
-function getSubstrateButtonColor({
+function getShadowButtonColor({
   isDisabled,
   isWalletConnected,
   isError,

src/features/swap/SwapConfirm.tsx

@@ -147,21 +147,22 @@ export function SwapConfirmCard({ formValues }: Props) {
       return
     }
 
-    if (!sendApproveTx || isApproveTxSuccess || isApproveTxLoading) {
-      logger.debug('Approve already started or finished, ignoring submit')
-      return
-    }
-
-    try {
-      logger.info('Sending approve tx')
-      const approveResult = await sendApproveTx()
-      const approveReceipt = await approveResult.wait(1)
-      toastToYourSuccess('Approve complete, starting swap', approveReceipt.transactionHash, chainId)
-      setApproveConfirmed(true)
-      logger.info(`Tx receipt received for approve: ${approveReceipt.transactionHash}`)
-    } catch (error) {
-      logger.error('Failed to approve token', error)
-      setIsModalOpen(false)
+    if (sendApproveTx) {
+      try {
+        logger.info('Sending approve tx')
+        const approveResult = await sendApproveTx()
+        const approveReceipt = await approveResult.wait(1)
+        toastToYourSuccess(
+          'Approve complete, starting swap',
+          approveReceipt.transactionHash,
+          chainId
+        )
+        setApproveConfirmed(true)
+        logger.info(`Tx receipt received for approve: ${approveReceipt.transactionHash}`)
+      } catch (error) {
+        logger.error('Failed to approve token', error)
+        setIsModalOpen(false)
+      }
     }
   }