From 95bd2b7940f0c5b2368b6d50aed2f9d294e534d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20=C5=9Al=C4=99zak?= <102536422+filipslezaklab@users.noreply.github.com> Date: Fri, 3 Jul 2026 14:02:15 +0200 Subject: [PATCH] ui fixes batch 3 (#1007) --- .../AddPage/components/AddCard/style.scss | 10 +++--- .../ConnectModalMfaSettings.tsx | 2 +- .../components/Icon/icons/IconReport.tsx | 12 +++---- .../LocationCardMfaEmailView.tsx | 32 ++++++++++-------- .../LocationCardMfaTotpView.tsx | 32 ++++++++++-------- .../OverviewLocationCard/style.scss | 19 +++++++++-- .../components/ConnectionWatcher/style.scss | 11 +++++- .../shared/components/WindowHeader/style.scss | 6 +++- src-tauri/icons/128x128.png | Bin 16016 -> 0 bytes src-tauri/icons/128x128@2x.png | Bin 52424 -> 0 bytes src-tauri/icons/32x32.png | Bin 2080 -> 0 bytes src-tauri/icons/64x64.png | Bin 5600 -> 0 bytes src-tauri/icons/Square107x107Logo.png | Bin 12143 -> 0 bytes src-tauri/icons/Square142x142Logo.png | Bin 18909 -> 0 bytes src-tauri/icons/Square150x150Logo.png | Bin 20609 -> 0 bytes src-tauri/icons/Square284x284Logo.png | Bin 63733 -> 0 bytes src-tauri/icons/Square30x30Logo.png | Bin 1912 -> 0 bytes src-tauri/icons/Square310x310Logo.png | Bin 75652 -> 0 bytes src-tauri/icons/Square44x44Logo.png | Bin 3253 -> 0 bytes src-tauri/icons/Square71x71Logo.png | Bin 6650 -> 0 bytes src-tauri/icons/Square89x89Logo.png | Bin 9258 -> 0 bytes src-tauri/icons/StoreLogo.png | Bin 3861 -> 0 bytes src-tauri/icons/icon.png | Bin 182335 -> 0 bytes src-tauri/icons/macos/128x128.png | Bin 0 -> 13319 bytes src-tauri/icons/macos/128x128@2x.png | Bin 0 -> 41131 bytes src-tauri/icons/macos/32x32.png | Bin 0 -> 1884 bytes src-tauri/icons/macos/64x64.png | Bin 0 -> 4833 bytes src-tauri/icons/macos/Square107x107Logo.png | Bin 0 -> 10262 bytes src-tauri/icons/macos/Square142x142Logo.png | Bin 0 -> 15736 bytes src-tauri/icons/macos/Square150x150Logo.png | Bin 0 -> 16962 bytes src-tauri/icons/macos/Square284x284Logo.png | Bin 0 -> 50052 bytes src-tauri/icons/macos/Square30x30Logo.png | Bin 0 -> 1758 bytes src-tauri/icons/macos/Square310x310Logo.png | Bin 0 -> 58582 bytes src-tauri/icons/macos/Square44x44Logo.png | Bin 0 -> 2898 bytes src-tauri/icons/macos/Square71x71Logo.png | Bin 0 -> 5760 bytes src-tauri/icons/macos/Square89x89Logo.png | Bin 0 -> 7885 bytes src-tauri/icons/macos/StoreLogo.png | Bin 0 -> 3536 bytes src-tauri/icons/macos/icon.icns | Bin 0 -> 786625 bytes src-tauri/icons/macos/icon.ico | Bin 0 -> 54590 bytes src-tauri/icons/macos/icon.png | Bin 0 -> 150280 bytes src-tauri/icons/windows/128x128.png | Bin 0 -> 17233 bytes src-tauri/icons/windows/128x128@2x.png | Bin 0 -> 56151 bytes src-tauri/icons/windows/32x32.png | Bin 0 -> 2213 bytes src-tauri/icons/windows/64x64.png | Bin 0 -> 6088 bytes src-tauri/icons/windows/Square107x107Logo.png | Bin 0 -> 13127 bytes src-tauri/icons/windows/Square142x142Logo.png | Bin 0 -> 20302 bytes src-tauri/icons/windows/Square150x150Logo.png | Bin 0 -> 22014 bytes src-tauri/icons/windows/Square284x284Logo.png | Bin 0 -> 68129 bytes src-tauri/icons/windows/Square30x30Logo.png | Bin 0 -> 2035 bytes src-tauri/icons/windows/Square310x310Logo.png | Bin 0 -> 81002 bytes src-tauri/icons/windows/Square44x44Logo.png | Bin 0 -> 3483 bytes src-tauri/icons/windows/Square71x71Logo.png | Bin 0 -> 7204 bytes src-tauri/icons/windows/Square89x89Logo.png | Bin 0 -> 10019 bytes src-tauri/icons/windows/StoreLogo.png | Bin 0 -> 4206 bytes src-tauri/icons/{ => windows}/icon.icns | Bin 1117556 -> 1117556 bytes src-tauri/icons/{ => windows}/icon.ico | Bin src-tauri/icons/windows/icon.png | Bin 0 -> 210774 bytes src-tauri/src/window_manager/mod.rs | 2 +- src-tauri/tauri.conf.json | 30 ++++++---------- src-tauri/tauri.dmg.conf.json | 15 ++++---- src-tauri/tauri.macos.conf.json | 7 ++++ 61 files changed, 106 insertions(+), 72 deletions(-) delete mode 100644 src-tauri/icons/128x128.png delete mode 100644 src-tauri/icons/128x128@2x.png delete mode 100644 src-tauri/icons/32x32.png delete mode 100644 src-tauri/icons/64x64.png delete mode 100644 src-tauri/icons/Square107x107Logo.png delete mode 100644 src-tauri/icons/Square142x142Logo.png delete mode 100644 src-tauri/icons/Square150x150Logo.png delete mode 100644 src-tauri/icons/Square284x284Logo.png delete mode 100644 src-tauri/icons/Square30x30Logo.png delete mode 100644 src-tauri/icons/Square310x310Logo.png delete mode 100644 src-tauri/icons/Square44x44Logo.png delete mode 100644 src-tauri/icons/Square71x71Logo.png delete mode 100644 src-tauri/icons/Square89x89Logo.png delete mode 100644 src-tauri/icons/StoreLogo.png delete mode 100644 src-tauri/icons/icon.png create mode 100644 src-tauri/icons/macos/128x128.png create mode 100644 src-tauri/icons/macos/128x128@2x.png create mode 100644 src-tauri/icons/macos/32x32.png create mode 100644 src-tauri/icons/macos/64x64.png create mode 100644 src-tauri/icons/macos/Square107x107Logo.png create mode 100644 src-tauri/icons/macos/Square142x142Logo.png create mode 100644 src-tauri/icons/macos/Square150x150Logo.png create mode 100644 src-tauri/icons/macos/Square284x284Logo.png create mode 100644 src-tauri/icons/macos/Square30x30Logo.png create mode 100644 src-tauri/icons/macos/Square310x310Logo.png create mode 100644 src-tauri/icons/macos/Square44x44Logo.png create mode 100644 src-tauri/icons/macos/Square71x71Logo.png create mode 100644 src-tauri/icons/macos/Square89x89Logo.png create mode 100644 src-tauri/icons/macos/StoreLogo.png create mode 100644 src-tauri/icons/macos/icon.icns create mode 100644 src-tauri/icons/macos/icon.ico create mode 100644 src-tauri/icons/macos/icon.png create mode 100644 src-tauri/icons/windows/128x128.png create mode 100644 src-tauri/icons/windows/128x128@2x.png create mode 100644 src-tauri/icons/windows/32x32.png create mode 100644 src-tauri/icons/windows/64x64.png create mode 100644 src-tauri/icons/windows/Square107x107Logo.png create mode 100644 src-tauri/icons/windows/Square142x142Logo.png create mode 100644 src-tauri/icons/windows/Square150x150Logo.png create mode 100644 src-tauri/icons/windows/Square284x284Logo.png create mode 100644 src-tauri/icons/windows/Square30x30Logo.png create mode 100644 src-tauri/icons/windows/Square310x310Logo.png create mode 100644 src-tauri/icons/windows/Square44x44Logo.png create mode 100644 src-tauri/icons/windows/Square71x71Logo.png create mode 100644 src-tauri/icons/windows/Square89x89Logo.png create mode 100644 src-tauri/icons/windows/StoreLogo.png rename src-tauri/icons/{ => windows}/icon.icns (99%) rename src-tauri/icons/{ => windows}/icon.ico (100%) create mode 100644 src-tauri/icons/windows/icon.png diff --git a/new-ui/src/pages/full/AddPage/components/AddCard/style.scss b/new-ui/src/pages/full/AddPage/components/AddCard/style.scss index d41fc982..e8d89154 100644 --- a/new-ui/src/pages/full/AddPage/components/AddCard/style.scss +++ b/new-ui/src/pages/full/AddPage/components/AddCard/style.scss @@ -1,17 +1,16 @@ .add-card { --border: var(--border-action-disabled); --shadow: box-shadow: 0 4px 12px 0 rgb(13 47 157 / 0%); - --color: var(--fg-white-80); + --color: var(--fg-white-60); box-sizing: border-box; border-radius: 12px; border: 1px solid var(--border); box-shadow: var(--shadow); - color: var(--color); overflow: hidden; transition-duration: 160ms; transition-timing-function: ease-out; - transition-property: border-color, box-shadow, color; + transition-property: border-color, box-shadow; max-width: 342px; min-height: 172px; @@ -48,9 +47,12 @@ } .description { - color: inherit; + color: var(--color); font: var(--t-body-xs-400); padding-bottom: var(--spacing-xl); + transition-duration: 160ms; + transition-timing-function: ease-out; + transition-property: color; } > .track { diff --git a/new-ui/src/pages/full/OverviewPage/components/ConnectModal/views/ConnectModalMfaSettings/ConnectModalMfaSettings.tsx b/new-ui/src/pages/full/OverviewPage/components/ConnectModal/views/ConnectModalMfaSettings/ConnectModalMfaSettings.tsx index 6506d08f..35e111b5 100644 --- a/new-ui/src/pages/full/OverviewPage/components/ConnectModal/views/ConnectModalMfaSettings/ConnectModalMfaSettings.tsx +++ b/new-ui/src/pages/full/OverviewPage/components/ConnectModal/views/ConnectModalMfaSettings/ConnectModalMfaSettings.tsx @@ -41,7 +41,7 @@ export const ConnectModalMfaSettings = () => { const [selectedMethod, setSelectedMethod] = useState(currentMethod); - const [setAsDefault, setSetAsDefault] = useState(true); + const [setAsDefault, setSetAsDefault] = useState(perviousView === null); const MfaFactorsList = useMemo((): MfaMethodValue[] => { if (location?.location_mfa_mode === LocationMfaMode.Internal) { diff --git a/new-ui/src/shared/components/Icon/icons/IconReport.tsx b/new-ui/src/shared/components/Icon/icons/IconReport.tsx index 14d31604..8bbb5bb8 100644 --- a/new-ui/src/shared/components/Icon/icons/IconReport.tsx +++ b/new-ui/src/shared/components/Icon/icons/IconReport.tsx @@ -4,17 +4,15 @@ export const IconReport = (props: SVGProps) => { return ( ); diff --git a/new-ui/src/shared/components/LocationCard/views/LocationCardMfaEmailView/LocationCardMfaEmailView.tsx b/new-ui/src/shared/components/LocationCard/views/LocationCardMfaEmailView/LocationCardMfaEmailView.tsx index 5066c7c5..e03ecb8c 100644 --- a/new-ui/src/shared/components/LocationCard/views/LocationCardMfaEmailView/LocationCardMfaEmailView.tsx +++ b/new-ui/src/shared/components/LocationCard/views/LocationCardMfaEmailView/LocationCardMfaEmailView.tsx @@ -38,17 +38,22 @@ export const LocationCardMfaEmailView = () => { const [emailCode, setEmailCode] = useState(null); const [error, setError] = useState(null); - const handleVerify = useCallback(() => { - if (!isPresent(emailCode)) { - setError('Enter code'); - return; - } - if (emailCode.length !== 6) { - setError('6 digits are required'); - return; - } - verifyCode(emailCode); - }, [emailCode, verifyCode]); + const handleVerify = useCallback( + (argCode?: string | null) => { + const toCheck = argCode ?? emailCode; + + if (!isPresent(toCheck)) { + setError('Enter code'); + return; + } + if (toCheck.length !== 6) { + setError('6 digits are required'); + return; + } + verifyCode(toCheck); + }, + [emailCode, verifyCode], + ); // biome-ignore lint/correctness/useExhaustiveDependencies: side effect of code input useEffect(() => { @@ -83,8 +88,7 @@ export const LocationCardMfaEmailView = () => { onChange={setEmailCode} error={startError ?? error} onSuccessPaste={(value) => { - setEmailCode(value); - handleVerify(); + handleVerify(value); }} /> @@ -107,7 +111,7 @@ export const LocationCardMfaEmailView = () => {