From 42e1b5ca7e4a474b6602ee126ea0e6da802a4922 Mon Sep 17 00:00:00 2001 From: Matiss Janis Aboltins Date: Tue, 12 Sep 2023 17:10:46 +0100 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=94=A5=20removing=20privacyMode=20fea?= =?UTF-8?q?ture=20flag=20(#1688)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/desktop-client/src/components/PrivacyFilter.tsx | 4 +--- packages/desktop-client/src/components/Titlebar.tsx | 3 +-- .../desktop-client/src/components/settings/Experimental.tsx | 1 - packages/desktop-client/src/hooks/useFeatureFlag.ts | 1 - packages/loot-core/src/types/prefs.d.ts | 1 - upcoming-release-notes/1688.md | 6 ++++++ 6 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 upcoming-release-notes/1688.md diff --git a/packages/desktop-client/src/components/PrivacyFilter.tsx b/packages/desktop-client/src/components/PrivacyFilter.tsx index a1d038f5f91..ac8fd543a75 100644 --- a/packages/desktop-client/src/components/PrivacyFilter.tsx +++ b/packages/desktop-client/src/components/PrivacyFilter.tsx @@ -8,7 +8,6 @@ import React, { import usePrivacyMode from 'loot-core/src/client/privacy'; -import useFeatureFlag from '../hooks/useFeatureFlag'; import { useResponsive } from '../ResponsiveProvider'; import View from './common/View'; @@ -53,7 +52,6 @@ export default function PrivacyFilter({ children, ...props }: PrivacyFilterProps) { - let privacyModeFeatureFlag = useFeatureFlag('privacyMode'); let privacyMode = usePrivacyMode(); // Limit mobile support for now. let { isNarrowWidth } = useResponsive(); @@ -67,7 +65,7 @@ export default function PrivacyFilter({ let blurAmount = blurIntensity != null ? `${blurIntensity}px` : '3px'; - return !privacyModeFeatureFlag || !activate ? ( + return !activate ? ( <>{Children.toArray(children)} ) : ( diff --git a/packages/desktop-client/src/components/Titlebar.tsx b/packages/desktop-client/src/components/Titlebar.tsx index fab82dbe3ab..a91446e353f 100644 --- a/packages/desktop-client/src/components/Titlebar.tsx +++ b/packages/desktop-client/src/components/Titlebar.tsx @@ -296,7 +296,6 @@ export default function Titlebar({ style }) { state => state.prefs.global.floatingSidebar, ); - let privacyModeFeatureFlag = useFeatureFlag('privacyMode'); let themesFlag = useFeatureFlag('themes'); return isNarrowWidth ? null : ( @@ -369,7 +368,7 @@ export default function Titlebar({ style }) { {themesFlag && } - {privacyModeFeatureFlag && } + {serverURL ? : null} diff --git a/packages/desktop-client/src/components/settings/Experimental.tsx b/packages/desktop-client/src/components/settings/Experimental.tsx index 37ea3ac5d89..a2237ff8fcd 100644 --- a/packages/desktop-client/src/components/settings/Experimental.tsx +++ b/packages/desktop-client/src/components/settings/Experimental.tsx @@ -99,7 +99,6 @@ export default function ExperimentalFeatures() { Goal templates - Privacy mode Experimental OFX parser diff --git a/packages/desktop-client/src/hooks/useFeatureFlag.ts b/packages/desktop-client/src/hooks/useFeatureFlag.ts index 70324fd6a67..84571e1fcbe 100644 --- a/packages/desktop-client/src/hooks/useFeatureFlag.ts +++ b/packages/desktop-client/src/hooks/useFeatureFlag.ts @@ -6,7 +6,6 @@ const DEFAULT_FEATURE_FLAG_STATE: Record = { categorySpendingReport: false, reportBudget: false, goalTemplatesEnabled: false, - privacyMode: true, themes: false, experimentalOfxParser: true, }; diff --git a/packages/loot-core/src/types/prefs.d.ts b/packages/loot-core/src/types/prefs.d.ts index 56ea97a1527..ef97ecf4383 100644 --- a/packages/loot-core/src/types/prefs.d.ts +++ b/packages/loot-core/src/types/prefs.d.ts @@ -4,7 +4,6 @@ export type FeatureFlag = | 'categorySpendingReport' | 'reportBudget' | 'goalTemplatesEnabled' - | 'privacyMode' | 'themes' | 'experimentalOfxParser'; diff --git a/upcoming-release-notes/1688.md b/upcoming-release-notes/1688.md new file mode 100644 index 00000000000..76a928360e3 --- /dev/null +++ b/upcoming-release-notes/1688.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [MatissJanis] +--- + +Remove `privacyMode` feature flag as this feature is GA From 8167ea8a83eeb0413e0b3fc83fe371002723412a Mon Sep 17 00:00:00 2001 From: Matiss Janis Aboltins Date: Tue, 12 Sep 2023 17:11:00 +0100 Subject: [PATCH 2/3] :art: fix multiline label in schedules modal (#1687) --- .../src/components/schedules/EditSchedule.js | 16 +++++----------- upcoming-release-notes/1687.md | 6 ++++++ 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 upcoming-release-notes/1687.md diff --git a/packages/desktop-client/src/components/schedules/EditSchedule.js b/packages/desktop-client/src/components/schedules/EditSchedule.js index 506c34eb642..132362b606e 100644 --- a/packages/desktop-client/src/components/schedules/EditSchedule.js +++ b/packages/desktop-client/src/components/schedules/EditSchedule.js @@ -527,8 +527,8 @@ export default function ScheduleDetails({ modalProps, actions, id }) { - - + + {repeats ? ( - + {!adding && state.schedule.rule && ( - + {state.isCustom && ( )} - + diff --git a/upcoming-release-notes/1687.md b/upcoming-release-notes/1687.md new file mode 100644 index 00000000000..b229e4e0ba2 --- /dev/null +++ b/upcoming-release-notes/1687.md @@ -0,0 +1,6 @@ +--- +category: Bugfix +authors: [MatissJanis] +--- + +Fix a checkbox label sometimes appearing in multiple lines in the schedules modal From 4e4d20ad31f4030871362d12c2805846c3e81895 Mon Sep 17 00:00:00 2001 From: Crazypkr1099 Date: Tue, 12 Sep 2023 12:15:04 -0400 Subject: [PATCH 3/3] Update Visual Regression README File (#1689) --- packages/desktop-client/README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/desktop-client/README.md b/packages/desktop-client/README.md index 3228051f1d4..834b79b486a 100644 --- a/packages/desktop-client/README.md +++ b/packages/desktop-client/README.md @@ -37,15 +37,20 @@ First start the dev server: ```sh HTTPS=true yarn start ``` - -Next, run the standartised docker container and launch the visual regression tests from within it. +Next, navigate to the root of your project folder, run the standartised docker container, and launch the visual regression tests from within it. ```sh # Run docker container docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v1.37.0-jammy /bin/bash + # If you recieve an error such as "docker: invalid reference format", please instead use the following command: + docker run --rm --network host -v ${pwd}:/work/ -w /work/ -it mcr.microsoft.com/playwright:v1.37.0-jammy /bin/bash + # Run the VRT tests: important - they MUST be ran against a HTTPS server E2E_START_URL=https://192.168.0.178:3001 yarn vrt + + # To update snapshots, use the following command: + E2E_START_URL=https://192.168.0.178:3001 yarn vrt --update-snapshots ``` #### Running against a remote server