Merge branch 'master' into scrollToLocationBudget

packages/desktop-client/src/components/accounts/Header.jsx

@@ -271,7 +271,7 @@ export function AccountHeader({
                     }
                     style={{ marginRight: 4 }}
                   />{' '}
-                  {isServerOffline ? 'Sync offline' : 'Sync'}
+                  {isServerOffline ? 'Bank Sync Offline' : 'Bank Sync'}
                 </>
               ) : (
                 <>

packages/desktop-client/src/components/autocomplete/AccountAutocomplete.tsx

@@ -122,13 +122,12 @@ export function AccountAutocomplete({
     .filter(item => {
       return includeClosedAccounts ? item : !item.closed;
     })
-    .sort((a, b) => {
+    .sort(
-      if (a.closed === b.closed) {
+      (a, b) =>
-        return a.offbudget === b.offbudget ? 0 : a.offbudget ? 1 : -1;
+        a.closed - b.closed ||
-      } else {
+        a.offbudget - b.offbudget ||
-        return a.closed ? 1 : -1;
+        a.sort_order - b.sort_order,
-      }
+    );
-    });
 
   return (
     <Autocomplete

packages/desktop-client/src/components/reports/Overview.tsx

@@ -25,7 +25,6 @@ export function Overview() {
   const location = useLocation();
   sessionStorage.setItem('url', location.pathname);
 
-  const customReportsFeatureFlag = useFeatureFlag('customReports');
   const spendingReportFeatureFlag = useFeatureFlag('spendingReport');
 
   const accounts = useAccounts();
@@ -43,7 +42,7 @@ export function Overview() {
             }}
           >
             <PageHeader title="Reports" />
-            {customReportsFeatureFlag && !isNarrowWidth && (
+            {!isNarrowWidth && (
               <Link to="/reports/custom" style={{ textDecoration: 'none' }}>
                 <Button type="primary">
                   <Text>Create new custom report</Text>
@@ -66,9 +65,7 @@ export function Overview() {
         <CashFlowCard />
         {spendingReportFeatureFlag && <SpendingCard />}
       </View>
-      {customReportsFeatureFlag && (
+      <CustomReportListCards reports={customReports} />
-        <CustomReportListCards reports={customReports} />
-      )}
     </Page>
   );
 }

packages/desktop-client/src/components/settings/Experimental.tsx

@@ -79,7 +79,6 @@ export function ExperimentalFeatures() {
       primaryAction={
         expanded ? (
           <View style={{ gap: '1em' }}>
-            <FeatureToggle flag="customReports">Custom reports</FeatureToggle>
             <FeatureToggle flag="spendingReport">
               Monthly spending
             </FeatureToggle>

packages/desktop-client/src/hooks/useFeatureFlag.ts

@@ -6,7 +6,6 @@ import type { FeatureFlag } from 'loot-core/src/types/prefs';
 const DEFAULT_FEATURE_FLAG_STATE: Record<FeatureFlag, boolean> = {
   reportBudget: false,
   goalTemplatesEnabled: false,
-  customReports: false,
   spendingReport: false,
   simpleFinSync: false,
   iterableTopologicalSort: true,

packages/loot-core/src/client/actions/account.ts

@@ -243,5 +243,6 @@ export function moveAccount(id, targetId) {
   return async (dispatch: Dispatch) => {
     await send('account-move', { id, targetId });
     dispatch(getAccounts());
+    dispatch(getPayees());
   };
 }

packages/loot-core/src/server/db/index.ts

@@ -536,7 +536,7 @@ export function getPayees() {
     SELECT p.*, COALESCE(a.name, p.name) AS name FROM payees p
     LEFT JOIN accounts a ON (p.transfer_acct = a.id AND a.tombstone = 0)
     WHERE p.tombstone = 0 AND (p.transfer_acct IS NULL OR a.id IS NOT NULL)
-    ORDER BY p.transfer_acct IS NULL DESC, p.name COLLATE NOCASE
+    ORDER BY p.transfer_acct IS NULL DESC, p.name COLLATE NOCASE, a.offbudget, a.sort_order
   `);
 }
 

packages/loot-core/src/types/prefs.d.ts

@@ -3,7 +3,6 @@ import { type numberFormats } from '../shared/util';
 export type FeatureFlag =
   | 'reportBudget'
   | 'goalTemplatesEnabled'
-  | 'customReports'
   | 'spendingReport'
   | 'simpleFinSync'
   | 'iterableTopologicalSort';

upcoming-release-notes/2554.md

@@ -0,0 +1,6 @@
+---
+category: Features
+authors: [carkom]
+---
+
+Removing custom reports from feature flag "experimental" state.

upcoming-release-notes/2896.md

@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [dymanoid]
+---
+
+Respect the user-defined account sort order in all autocomplete lists.

upcoming-release-notes/2899.md

@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [MatissJanis]
+---
+
+Bank Sync: update bank-sync button label to "Bank Sync" to improve discoverability for new users