From 0108707ffedbbc328435f5769c2d85dc234c64ad Mon Sep 17 00:00:00 2001
From: iower <iower@tutanota.com>
Date: Thu, 5 Oct 2023 19:41:37 +0500
Subject: [PATCH] Styles

---
 src/ui/assets/close-white.svg                        |  4 ++--
 src/ui/style/index.less                              |  2 +-
 .../Approval/components/Actions/TokenApprove.tsx     |  2 +-
 .../Approval/components/FooterBar/SubmitActions.tsx  | 12 +++---------
 .../Approval/components/TxComponents/GasSelecter.tsx |  2 +-
 .../components/ModalConfirmAddToContacts.tsx         |  5 ++++-
 6 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/ui/assets/close-white.svg b/src/ui/assets/close-white.svg
index d204b51bdfb..94412512866 100644
--- a/src/ui/assets/close-white.svg
+++ b/src/ui/assets/close-white.svg
@@ -1,4 +1,4 @@
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.83203 5.83594L14.1654 14.1693" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.83203 14.1693L14.1654 5.83594" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.83203 5.83594L14.1654 14.1693" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.83203 14.1693L14.1654 5.83594" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/ui/style/index.less b/src/ui/style/index.less
index a427f8f6b87..ad3286de506 100644
--- a/src/ui/style/index.less
+++ b/src/ui/style/index.less
@@ -345,6 +345,6 @@ button:focus {
 
 @layer utilities {
   .main-button {
-    @apply text-mainButton font-semibold bg-mainButton hover:bg-mainButtonHover active:bg-mainButtonActive disabled:bg-mainButtonDisabled !important;
+    @apply text-mainButton font-semibold bg-mainButton hover:bg-mainButtonHover active:bg-mainButtonActive disabled:bg-mainButtonDisabled disabled:cursor-not-allowed !important;
   }
 }
diff --git a/src/ui/views/Approval/components/Actions/TokenApprove.tsx b/src/ui/views/Approval/components/Actions/TokenApprove.tsx
index dadf9665db3..11e3d12d401 100644
--- a/src/ui/views/Approval/components/Actions/TokenApprove.tsx
+++ b/src/ui/views/Approval/components/Actions/TokenApprove.tsx
@@ -136,7 +136,7 @@ const ApproveAmountModal = ({
       <div className="flex justify-center mt-32 popup-footer">
         <Button
           type="primary"
-          className="w-[200px]"
+          className="w-[200px] main-button"
           size="large"
           htmlType="submit"
           disabled={!canSubmit}
diff --git a/src/ui/views/Approval/components/FooterBar/SubmitActions.tsx b/src/ui/views/Approval/components/FooterBar/SubmitActions.tsx
index 53f0c2745c9..4a8d0321c4f 100644
--- a/src/ui/views/Approval/components/FooterBar/SubmitActions.tsx
+++ b/src/ui/views/Approval/components/FooterBar/SubmitActions.tsx
@@ -43,19 +43,14 @@ export const SubmitActions: React.FC<Props> = ({
           )}
         >
           <button
-            className={clsx(
-              'text-button bg-button enabled:hover:bg-button-hover enabled:active:bg-button-active',
-              'w-[184px] h-full',
-              'font-medium'
-            )}
+            className="w-[184px] h-full main-button"
             onClick={handleClickConfirm}
           >
             {t('global.confirmButton')}
           </button>
           <button
             className={clsx(
-              'text-button bg-button enabled:hover:bg-button-hover enabled:active:bg-button-active',
-              'w-[60px] h-full',
+              'w-[60px] h-full main-button',
               'flex justify-center items-center'
             )}
             onClick={handleClickCancel}
@@ -73,8 +68,7 @@ export const SubmitActions: React.FC<Props> = ({
               disabled={disabledProcess}
               type="primary"
               className={clsx(
-                'w-[246px] h-[48px] rounded-[8px] text-button',
-                'bg-button enabled:hover:bg-button-hover enabled:active:bg-button-active disabled:opacity-40 disabled:cursor-not-allowed',
+                'w-[246px] h-[48px] rounded-[8px] main-button',
                 'before:content-none'
               )}
               onClick={handleClickSign}
diff --git a/src/ui/views/Approval/components/TxComponents/GasSelecter.tsx b/src/ui/views/Approval/components/TxComponents/GasSelecter.tsx
index 03135a10dca..840a6344f72 100644
--- a/src/ui/views/Approval/components/TxComponents/GasSelecter.tsx
+++ b/src/ui/views/Approval/components/TxComponents/GasSelecter.tsx
@@ -907,7 +907,7 @@ const GasSelector = ({
         <div className="flex justify-center mt-32 popup-footer">
           <Button
             type="primary"
-            className="w-[200px]"
+            className="w-[200px] main-button"
             size="large"
             onClick={handleModalConfirmGas}
             disabled={!isReady || validateStatus.customGas.status === 'error'}
diff --git a/src/ui/views/SendToken/components/ModalConfirmAddToContacts.tsx b/src/ui/views/SendToken/components/ModalConfirmAddToContacts.tsx
index 356db375a89..5f5f2d580ab 100644
--- a/src/ui/views/SendToken/components/ModalConfirmAddToContacts.tsx
+++ b/src/ui/views/SendToken/components/ModalConfirmAddToContacts.tsx
@@ -209,7 +209,10 @@ function ModalConfirmAddToContacts({
             type="primary"
             size="large"
             htmlType="submit"
-            className={clsx(cancelText ? 'w-[172px]' : 'w-[200px]')}
+            className={clsx(
+              'main-button',
+              cancelText ? 'w-[172px]' : 'w-[200px]'
+            )}
             disabled={false}
           >
             {confirmText}