Merge branch 'master' into darkThemeReports

actualbudget · Sep 12, 2023 · 095d8e4 · 095d8e4
2 parents 23c9939 + 4e4d20a
commit 095d8e4
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 21 deletions.
diff --git 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

diff --git 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)}</>
   ) : (
     <BlurredOverlay blurIntensity={blurAmount} {...props}>

diff --git 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 }) {
       <View style={{ flex: 1 }} />
       <UncategorizedButton />
       {themesFlag && <ThemeSelector />}
-      {privacyModeFeatureFlag && <PrivacyButton />}
+      <PrivacyButton />
       {serverURL ? <SyncButton style={{ marginLeft: 10 }} /> : null}
       <LoggedInUser style={{ marginLeft: 10 }} />
     </View>

diff --git 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 }) {
         <FormLabel title="Date" />
       </View>
 
-      <Stack direction="row" align="flex-start">
-        <View style={{ flex: 1, width: '13.44rem' }}>
+      <Stack direction="row" align="flex-start" justify="space-between">
+        <View style={{ width: '13.44rem' }}>
           {repeats ? (
             <RecurringSchedulePicker
               value={state.fields.date}
@@ -569,7 +569,6 @@ export default function ScheduleDetails({ modalProps, actions, id }) {
         <View
           style={{
             marginTop: 5,
-            flex: 1,
             flexDirection: 'row',
             alignItems: 'center',
             userSelect: 'none',
@@ -587,12 +586,7 @@ export default function ScheduleDetails({ modalProps, actions, id }) {
           </label>
         </View>
 
-        <View
-          style={{
-            alignItems: 'flex-end',
-            flex: 1,
-          }}
-        >
+        <Stack align="flex-end">
           <View
             style={{
               marginTop: 5,
@@ -636,7 +630,7 @@ export default function ScheduleDetails({ modalProps, actions, id }) {
           </Text>
 
           {!adding && state.schedule.rule && (
-            <Stack direction="row" align="center" style={{ marginTop: 30 }}>
+            <Stack direction="row" align="center" style={{ marginTop: 20 }}>
               {state.isCustom && (
                 <Text
                   style={{
@@ -654,7 +648,7 @@ export default function ScheduleDetails({ modalProps, actions, id }) {
               </Button>
             </Stack>
           )}
-        </View>
+        </Stack>
       </Stack>
 
       <View style={{ marginTop: 30, flex: 1 }}>

diff --git a/packages/desktop-client/src/components/settings/Experimental.tsx b/packages/desktop-client/src/components/settings/Experimental.tsx
@@ -108,7 +108,6 @@ export default function ExperimentalFeatures() {
               Goal templates
             </FeatureToggle>
 
-            <FeatureToggle flag="privacyMode">Privacy mode</FeatureToggle>
             <FeatureToggle flag="experimentalOfxParser">
               Experimental OFX parser
             </FeatureToggle>

diff --git 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<FeatureFlag, boolean> = {
   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
@@ -4,7 +4,6 @@ export type FeatureFlag =
   | 'categorySpendingReport'
   | 'reportBudget'
   | 'goalTemplatesEnabled'
-  | 'privacyMode'
   | 'themes'
   | 'experimentalOfxParser';
 

diff --git a/upcoming-release-notes/1687.md 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
diff --git a/upcoming-release-notes/1688.md b/upcoming-release-notes/1688.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+Remove `privacyMode` feature flag as this feature is GA