From 1f39533abdbdc8fa169d5ba06ffbebc8a01cdd06 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@getsession.org>
Date: Tue, 14 Jan 2025 17:32:23 +1100
Subject: [PATCH] fix: make cancel button not hidden on light mode

---
 ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx | 1 -
 ts/themes/classicDark.ts                                     | 1 +
 ts/themes/classicLight.ts                                    | 1 +
 ts/themes/oceanDark.ts                                       | 1 +
 ts/themes/oceanLight.ts                                      | 1 +
 ts/themes/variableColors.tsx                                 | 1 +
 6 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx b/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx
index bfa7909ae..9499f59ce 100644
--- a/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx
+++ b/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx
@@ -101,7 +101,6 @@ export const BlockOrUnblockDialog = ({ pubkeys, action, onConfirmed }: NonNullab
             />
             <SessionButton
               buttonType={SessionButtonType.Simple}
-              buttonColor={SessionButtonColor.White}
               onClick={closeModal}
               text={window.i18n('cancel')}
               dataTestId="session-confirm-cancel-button"
diff --git a/ts/themes/classicDark.ts b/ts/themes/classicDark.ts
index 76f428695..b2b39f463 100644
--- a/ts/themes/classicDark.ts
+++ b/ts/themes/classicDark.ts
@@ -65,6 +65,7 @@ export const classicDark: ThemeColorVariables = {
 
   '--button-simple-text-color': 'var(--text-primary-color)',
   '--button-simple-disabled-color': 'var(--disabled-color)',
+  '--button-simple-text-hover-color': 'var(--disabled-color)',
 
   '--button-icon-background-color': 'var(--transparent-color)',
   '--button-icon-stroke-color': 'var(--text-secondary-color)',
diff --git a/ts/themes/classicLight.ts b/ts/themes/classicLight.ts
index 7f318196c..568ae6882 100644
--- a/ts/themes/classicLight.ts
+++ b/ts/themes/classicLight.ts
@@ -65,6 +65,7 @@ export const classicLight: ThemeColorVariables = {
 
   '--button-simple-text-color': 'var(--text-primary-color)',
   '--button-simple-disabled-color': 'var(--disabled-color)',
+  '--button-simple-text-hover-color': 'var(--disabled-color)',
 
   '--button-icon-background-color': 'var(--transparent-color)',
   '--button-icon-stroke-color': 'var(--text-secondary-color)',
diff --git a/ts/themes/oceanDark.ts b/ts/themes/oceanDark.ts
index 77765ddde..580f81b91 100644
--- a/ts/themes/oceanDark.ts
+++ b/ts/themes/oceanDark.ts
@@ -65,6 +65,7 @@ export const oceanDark: ThemeColorVariables = {
 
   '--button-simple-text-color': 'var(--text-primary-color)',
   '--button-simple-disabled-color': 'var(--disabled-color)',
+  '--button-simple-text-hover-color': 'var(--disabled-color)',
 
   '--button-icon-background-color': 'var(--transparent-color)',
   '--button-icon-stroke-color': 'var(--text-secondary-color)',
diff --git a/ts/themes/oceanLight.ts b/ts/themes/oceanLight.ts
index 9121be4fa..b1dc2b46f 100644
--- a/ts/themes/oceanLight.ts
+++ b/ts/themes/oceanLight.ts
@@ -65,6 +65,7 @@ export const oceanLight: ThemeColorVariables = {
 
   '--button-simple-text-color': 'var(--text-primary-color)',
   '--button-simple-disabled-color': 'var(--disabled-color)',
+  '--button-simple-text-hover-color': 'var(--disabled-color)',
 
   '--button-icon-background-color': 'var(--transparent-color)',
   '--button-icon-stroke-color': 'var(--text-secondary-color)',
diff --git a/ts/themes/variableColors.tsx b/ts/themes/variableColors.tsx
index 9d2392f24..8f3b54b85 100644
--- a/ts/themes/variableColors.tsx
+++ b/ts/themes/variableColors.tsx
@@ -79,6 +79,7 @@ export type ThemeColorVariables = {
   /* Simple */
   '--button-simple-text-color': string;
   '--button-simple-disabled-color': string;
+  '--button-simple-text-hover-color': string;
 
   /* Icons */
   '--button-icon-background-color': string;