diff --git a/packages/api/package.json b/packages/api/package.json
index b44b0152ff5..4f9c4adc949 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/api",
-  "version": "24.11.0",
+  "version": "24.12.0",
   "license": "MIT",
   "description": "An API for Actual",
   "engines": {
diff --git a/packages/desktop-client/e2e/page-models/mobile-navigation.js b/packages/desktop-client/e2e/page-models/mobile-navigation.js
index ebda4cbb777..6881b4d399e 100644
--- a/packages/desktop-client/e2e/page-models/mobile-navigation.js
+++ b/packages/desktop-client/e2e/page-models/mobile-navigation.js
@@ -1,3 +1,4 @@
+import { MobileAccountPage } from './mobile-account-page';
 import { MobileAccountsPage } from './mobile-accounts-page';
 import { MobileBudgetPage } from './mobile-budget-page';
 import { MobileTransactionEntryPage } from './mobile-transaction-entry-page';
@@ -22,6 +23,13 @@ export class MobileNavigation {
     return new MobileAccountsPage(this.page);
   }
 
+  async goToUncategorizedPage() {
+    const button = this.page.getByRole('button', { name: /uncategorized/ });
+    await button.click();
+
+    return new MobileAccountPage(this.page);
+  }
+
   async goToTransactionEntryPage() {
     const link = this.page.getByRole('link', { name: 'Transaction' });
     await link.click();
diff --git a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-1-chromium-linux.png
index 2f01d4b21a4..8b6fb7dfc07 100644
Binary files a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-2-chromium-linux.png
index 2619303ee1f..e821884d439 100644
Binary files a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-3-chromium-linux.png
index e91f7df9a86..986929ddd5d 100644
Binary files a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js b/packages/desktop-client/e2e/transactions.mobile.test.js
index 0327dc2b585..822b3b4c2a8 100644
--- a/packages/desktop-client/e2e/transactions.mobile.test.js
+++ b/packages/desktop-client/e2e/transactions.mobile.test.js
@@ -48,11 +48,8 @@ test.describe('Mobile Transactions', () => {
     );
     await expect(page).toMatchThemeScreenshots();
 
-    const accountPage = await transactionEntryPage.createTransaction();
-
-    await expect(accountPage.transactions.nth(0)).toHaveText(
-      'KrogerClothing-12.34',
-    );
+    await transactionEntryPage.createTransaction();
+    await expect(page.getByLabel('Transaction list')).toHaveCount(0);
     await expect(page).toMatchThemeScreenshots();
   });
 
@@ -82,4 +79,74 @@ test.describe('Mobile Transactions', () => {
       'KrogerClothing-12.34',
     );
   });
+
+  test('creates an uncategorized transaction from `/accounts/uncategorized` page', async () => {
+    // Create uncategorized transaction
+    let transactionEntryPage = await navigation.goToTransactionEntryPage();
+    await transactionEntryPage.amountField.fill('12.35');
+    // Click anywhere to cancel active edit.
+    await transactionEntryPage.header.click();
+    await transactionEntryPage.fillField(
+      page.getByTestId('account-field'),
+      'Ally Savings',
+    );
+    await transactionEntryPage.createTransaction();
+
+    const uncategorizedPage = await navigation.goToUncategorizedPage();
+    transactionEntryPage = await uncategorizedPage.clickCreateTransaction();
+
+    await expect(transactionEntryPage.header).toHaveText('New Transaction');
+
+    await transactionEntryPage.amountField.fill('12.34');
+    // Click anywhere to cancel active edit.
+    await transactionEntryPage.header.click();
+    await transactionEntryPage.fillField(
+      page.getByTestId('payee-field'),
+      'Kroger',
+    );
+
+    await transactionEntryPage.createTransaction();
+
+    await expect(uncategorizedPage.transactions.nth(0)).toHaveText(
+      'KrogerUncategorized-12.34',
+    );
+    await expect(page).toMatchThemeScreenshots();
+  });
+
+  test('creates a categorized transaction from `/accounts/uncategorized` page', async () => {
+    // Create uncategorized transaction
+    let transactionEntryPage = await navigation.goToTransactionEntryPage();
+    await transactionEntryPage.amountField.fill('12.35');
+    // Click anywhere to cancel active edit.
+    await transactionEntryPage.header.click();
+    await transactionEntryPage.fillField(
+      page.getByTestId('account-field'),
+      'Ally Savings',
+    );
+    await transactionEntryPage.createTransaction();
+
+    const uncategorizedPage = await navigation.goToUncategorizedPage();
+    transactionEntryPage = await uncategorizedPage.clickCreateTransaction();
+
+    await expect(transactionEntryPage.header).toHaveText('New Transaction');
+
+    await transactionEntryPage.amountField.fill('12.34');
+    // Click anywhere to cancel active edit.
+    await transactionEntryPage.header.click();
+    await transactionEntryPage.fillField(
+      page.getByTestId('payee-field'),
+      'Kroger',
+    );
+    await transactionEntryPage.fillField(
+      page.getByTestId('category-field'),
+      'Clothing',
+    );
+
+    await transactionEntryPage.createTransaction();
+
+    await expect(uncategorizedPage.transactions.nth(0)).toHaveText(
+      '(No payee)Uncategorized-12.35',
+    );
+    await expect(page).toMatchThemeScreenshots();
+  });
 });
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-1-chromium-linux.png
new file mode 100644
index 00000000000..ad64d91030a
Binary files /dev/null and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-2-chromium-linux.png
new file mode 100644
index 00000000000..c7cd31e05e4
Binary files /dev/null and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-3-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-3-chromium-linux.png
new file mode 100644
index 00000000000..bdcad535d4a
Binary files /dev/null and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-7-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-7-chromium-linux.png
index 09c4a4473d5..5d6a84f5a7a 100644
Binary files a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-7-chromium-linux.png and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-7-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-8-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-8-chromium-linux.png
index 02118f4e429..c8ed30e1d63 100644
Binary files a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-8-chromium-linux.png and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-8-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-9-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-9-chromium-linux.png
index 58a53f0cd3f..d10b3d513df 100644
Binary files a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-9-chromium-linux.png and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-9-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-1-chromium-linux.png
new file mode 100644
index 00000000000..72f98361371
Binary files /dev/null and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-2-chromium-linux.png
new file mode 100644
index 00000000000..1a2ebaae049
Binary files /dev/null and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-3-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-3-chromium-linux.png
new file mode 100644
index 00000000000..533989cdf55
Binary files /dev/null and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-1-chromium-linux.png
index 6d47cb90a5e..bf1a5b83010 100644
Binary files a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-1-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-2-chromium-linux.png
index 33925a4d26d..1cf49f768b1 100644
Binary files a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-2-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-3-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-3-chromium-linux.png
index 5ec0c0efbc5..d6ad5f63278 100644
Binary files a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-3-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-3-chromium-linux.png differ
diff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.json
index 6ac17296393..877539fa9f4 100644
--- a/packages/desktop-client/package.json
+++ b/packages/desktop-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/web",
-  "version": "24.11.0",
+  "version": "24.12.0",
   "license": "MIT",
   "files": [
     "build"
diff --git a/packages/desktop-client/src/components/LoggedInUser.tsx b/packages/desktop-client/src/components/LoggedInUser.tsx
index ec7df311bbf..8ad160f2294 100644
--- a/packages/desktop-client/src/components/LoggedInUser.tsx
+++ b/packages/desktop-client/src/components/LoggedInUser.tsx
@@ -6,6 +6,7 @@ import { useSelector } from 'react-redux';
 import { type State } from 'loot-core/src/client/state-types';
 
 import { useActions } from '../hooks/useActions';
+import { useNavigate } from '../hooks/useNavigate';
 import { theme, styles } from '../style';
 
 import { Button } from './common/Button2';
@@ -38,9 +39,11 @@ export function LoggedInUser({
     getUserData().then(() => setLoading(false));
   }, []);
 
+  const navigate = useNavigate();
+
   async function onChangePassword() {
     await closeBudget();
-    window.__navigate('/change-password');
+    navigate('/change-password');
   }
 
   async function onMenuSelect(type) {
@@ -52,14 +55,14 @@ export function LoggedInUser({
         break;
       case 'sign-in':
         await closeBudget();
-        window.__navigate('/login');
+        navigate('/login');
         break;
       case 'sign-out':
         signOut();
         break;
       case 'config-server':
         await closeBudget();
-        window.__navigate('/config-server');
+        navigate('/config-server');
         break;
       default:
     }
diff --git a/packages/desktop-client/src/components/accounts/Header.tsx b/packages/desktop-client/src/components/accounts/Header.tsx
index c45ae73eb1c..4a66ebc45de 100644
--- a/packages/desktop-client/src/components/accounts/Header.tsx
+++ b/packages/desktop-client/src/components/accounts/Header.tsx
@@ -369,7 +369,7 @@ export function AccountHeader({
               onMakeAsNonSplitTransactions={onMakeAsNonSplitTransactions}
             />
           )}
-          <View>
+          <View style={{ flex: '0 0 auto' }}>
             {account && (
               <>
                 <Button
@@ -427,7 +427,7 @@ export function AccountHeader({
             </View>
           </Button>
           {account ? (
-            <View>
+            <View style={{ flex: '0 0 auto' }}>
               <MenuButton
                 aria-label="Account menu"
                 ref={triggerRef}
@@ -456,7 +456,7 @@ export function AccountHeader({
               </Popover>
             </View>
           ) : (
-            <View>
+            <View style={{ flex: '0 0 auto' }}>
               <MenuButton
                 aria-label="Account menu"
                 ref={triggerRef}
diff --git a/packages/desktop-client/src/components/budget/SidebarCategory.tsx b/packages/desktop-client/src/components/budget/SidebarCategory.tsx
index 4d3b53e7a04..bdd3f55a54d 100644
--- a/packages/desktop-client/src/components/budget/SidebarCategory.tsx
+++ b/packages/desktop-client/src/components/budget/SidebarCategory.tsx
@@ -1,5 +1,5 @@
 // @ts-strict-ignore
-import React, { type CSSProperties, type Ref, useRef, useState } from 'react';
+import React, { type CSSProperties, type Ref, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import {
@@ -7,7 +7,7 @@ import {
   type CategoryEntity,
 } from 'loot-core/src/types/models';
 
-import { useFeatureFlag } from '../../hooks/useFeatureFlag';
+import { useContextMenu } from '../../hooks/useContextMenu';
 import { SvgCheveronDown } from '../../icons/v1';
 import { theme } from '../../style';
 import { Button } from '../common/Button2';
@@ -50,9 +50,9 @@ export function SidebarCategory({
   const { t } = useTranslation();
 
   const temporary = category.id === 'new';
-  const [menuOpen, setMenuOpen] = useState(false);
+  const { setMenuOpen, menuOpen, handleContextMenu, resetPosition, position } =
+    useContextMenu();
   const triggerRef = useRef(null);
-  const contextMenusEnabled = useFeatureFlag('contextMenus');
 
   const displayed = (
     <View
@@ -66,11 +66,7 @@ export function SidebarCategory({
         height: 20,
       }}
       ref={triggerRef}
-      onContextMenu={e => {
-        if (!contextMenusEnabled) return;
-        e.preventDefault();
-        setMenuOpen(true);
-      }}
+      onContextMenu={handleContextMenu}
     >
       <div
         data-testid="category-name"
@@ -88,7 +84,10 @@ export function SidebarCategory({
           variant="bare"
           className="hover-visible"
           style={{ color: 'currentColor', padding: 3 }}
-          onPress={() => setMenuOpen(true)}
+          onPress={() => {
+            resetPosition();
+            setMenuOpen(true);
+          }}
         >
           <SvgCheveronDown
             width={14}
@@ -102,8 +101,9 @@ export function SidebarCategory({
           placement="bottom start"
           isOpen={menuOpen}
           onOpenChange={() => setMenuOpen(false)}
-          style={{ width: 200 }}
+          style={{ width: 200, margin: 1 }}
           isNonModal
+          {...position}
         >
           <Menu
             onMenuSelect={type => {
diff --git a/packages/desktop-client/src/components/budget/SidebarGroup.tsx b/packages/desktop-client/src/components/budget/SidebarGroup.tsx
index 20a81eba986..87e6eaad4d2 100644
--- a/packages/desktop-client/src/components/budget/SidebarGroup.tsx
+++ b/packages/desktop-client/src/components/budget/SidebarGroup.tsx
@@ -1,8 +1,9 @@
 // @ts-strict-ignore
-import React, { type CSSProperties, useRef, useState } from 'react';
+import React, { type CSSProperties, useRef } from 'react';
 import { type ConnectDragSource } from 'react-dnd';
 import { useTranslation } from 'react-i18next';
 
+import { useContextMenu } from '../../hooks/useContextMenu';
 import { useFeatureFlag } from '../../hooks/useFeatureFlag';
 import { SvgExpandArrow } from '../../icons/v0';
 import { SvgCheveronDown } from '../../icons/v1';
@@ -58,9 +59,9 @@ export function SidebarGroup({
   const isGoalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');
 
   const temporary = group.id === 'new';
-  const [menuOpen, setMenuOpen] = useState(false);
+  const { setMenuOpen, menuOpen, handleContextMenu, resetPosition, position } =
+    useContextMenu();
   const triggerRef = useRef(null);
-  const contextMenusEnabled = useFeatureFlag('contextMenus');
 
   const displayed = (
     <View
@@ -75,11 +76,7 @@ export function SidebarGroup({
       onClick={() => {
         onToggleCollapse(group.id);
       }}
-      onContextMenu={e => {
-        if (!contextMenusEnabled) return;
-        e.preventDefault();
-        setMenuOpen(true);
-      }}
+      onContextMenu={handleContextMenu}
     >
       {!dragPreview && (
         <SvgExpandArrow
@@ -111,7 +108,10 @@ export function SidebarGroup({
             <Button
               variant="bare"
               className="hover-visible"
-              onPress={() => setMenuOpen(true)}
+              onPress={() => {
+                resetPosition();
+                setMenuOpen(true);
+              }}
               style={{ padding: 3 }}
             >
               <SvgCheveronDown width={14} height={14} />
@@ -122,8 +122,9 @@ export function SidebarGroup({
               placement="bottom start"
               isOpen={menuOpen}
               onOpenChange={() => setMenuOpen(false)}
-              style={{ width: 200 }}
+              style={{ width: 200, margin: 1 }}
               isNonModal
+              {...position}
             >
               <Menu
                 onMenuSelect={type => {
diff --git a/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx b/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx
index 78a42e0fd8d..0bb0491a2d8 100644
--- a/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx
@@ -3,7 +3,6 @@ import React, {
   type CSSProperties,
   memo,
   useRef,
-  useState,
 } from 'react';
 import { useTranslation, Trans } from 'react-i18next';
 
@@ -14,7 +13,7 @@ import { evalArithmetic } from 'loot-core/src/shared/arithmetic';
 import * as monthUtils from 'loot-core/src/shared/months';
 import { integerToCurrency, amountToInteger } from 'loot-core/src/shared/util';
 
-import { useFeatureFlag } from '../../../hooks/useFeatureFlag';
+import { useContextMenu } from '../../../hooks/useContextMenu';
 import { useUndo } from '../../../hooks/useUndo';
 import { SvgCheveronDown } from '../../../icons/v1';
 import { styles, theme } from '../../../style';
@@ -207,8 +206,20 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
 
   const budgetMenuTriggerRef = useRef(null);
   const balanceMenuTriggerRef = useRef(null);
-  const [budgetMenuOpen, setBudgetMenuOpen] = useState(false);
-  const [balanceMenuOpen, setBalanceMenuOpen] = useState(false);
+  const {
+    setMenuOpen: setBudgetMenuOpen,
+    menuOpen: budgetMenuOpen,
+    handleContextMenu: handleBudgetContextMenu,
+    resetPosition: resetBudgetPosition,
+    position: budgetPosition,
+  } = useContextMenu();
+  const {
+    setMenuOpen: setBalanceMenuOpen,
+    menuOpen: balanceMenuOpen,
+    handleContextMenu: handleBalanceContextMenu,
+    resetPosition: resetBalancePosition,
+    position: balancePosition,
+  } = useContextMenu();
 
   const onMenuAction = (...args: Parameters<typeof onBudgetAction>) => {
     onBudgetAction(...args);
@@ -216,7 +227,6 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
   };
 
   const { showUndoNotification } = useUndo();
-  const contextMenusEnabled = useFeatureFlag('contextMenus');
 
   return (
     <View
@@ -236,15 +246,14 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
       }}
     >
       <View
+        ref={budgetMenuTriggerRef}
         style={{
           flex: 1,
           flexDirection: 'row',
         }}
         onContextMenu={e => {
-          if (!contextMenusEnabled) return;
           if (editing) return;
-          e.preventDefault();
-          setBudgetMenuOpen(true);
+          handleBudgetContextMenu(e);
         }}
       >
         {!editing && (
@@ -261,9 +270,11 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
             }}
           >
             <Button
-              ref={budgetMenuTriggerRef}
               variant="bare"
-              onPress={() => setBudgetMenuOpen(true)}
+              onPress={() => {
+                resetBudgetPosition(2, -4);
+                setBudgetMenuOpen(true);
+              }}
               style={{
                 padding: 3,
               }}
@@ -278,11 +289,12 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
 
             <Popover
               triggerRef={budgetMenuTriggerRef}
-              placement="bottom start"
+              placement="bottom left"
               isOpen={budgetMenuOpen}
               onOpenChange={() => setBudgetMenuOpen(false)}
               style={{ width: 200 }}
               isNonModal
+              {...budgetPosition}
             >
               <BudgetMenu
                 onCopyLastMonthAverage={() => {
@@ -392,18 +404,25 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
         </span>
       </Field>
       <Field
+        ref={balanceMenuTriggerRef}
         name="balance"
         width="flex"
         style={{ paddingRight: styles.monthRightPadding, textAlign: 'right' }}
       >
         <span
-          ref={balanceMenuTriggerRef}
-          onClick={() => setBalanceMenuOpen(true)}
-          onContextMenu={e => {
-            if (!contextMenusEnabled) return;
-            e.preventDefault();
+          onClick={() => {
+            resetBalancePosition(-6, -4);
             setBalanceMenuOpen(true);
           }}
+          onContextMenu={e => {
+            handleBalanceContextMenu(e);
+            // We need to calculate differently from the hook ue to being aligned to the right
+            const rect = e.currentTarget.getBoundingClientRect();
+            resetBalancePosition(
+              e.clientX - rect.right + 200 - 8,
+              e.clientY - rect.bottom - 8,
+            );
+          }}
         >
           <BalanceWithCarryover
             carryover={envelopeBudget.catCarryover(category.id)}
@@ -419,8 +438,9 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
           placement="bottom end"
           isOpen={balanceMenuOpen}
           onOpenChange={() => setBalanceMenuOpen(false)}
-          style={{ width: 200 }}
+          style={{ width: 200, margin: 1 }}
           isNonModal
+          {...balancePosition}
         >
           <BalanceMovementMenu
             categoryId={category.id}
diff --git a/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudget.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudget.tsx
index 09316daae98..343de06d6ba 100644
--- a/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudget.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudget.tsx
@@ -1,13 +1,13 @@
 import React, {
-  useRef,
-  useState,
   type CSSProperties,
   useCallback,
+  useRef,
+  useState,
 } from 'react';
 
 import { envelopeBudget } from 'loot-core/src/client/queries';
 
-import { useFeatureFlag } from '../../../../hooks/useFeatureFlag';
+import { useContextMenu } from '../../../../hooks/useContextMenu';
 import { Popover } from '../../../common/Popover';
 import { View } from '../../../common/View';
 import { CoverMenu } from '../CoverMenu';
@@ -34,79 +34,88 @@ export function ToBudget({
   amountStyle,
   isCollapsed = false,
 }: ToBudgetProps) {
-  const [menuOpen, _setMenuOpen] = useState<string | null>(null);
+  const [menuStep, _setMenuStep] = useState<string>('actions');
   const triggerRef = useRef(null);
 
   const ref = useRef<HTMLSpanElement>(null);
-  const setMenuOpen = useCallback(
-    (menu: string | null) => {
+  const setMenuStep = useCallback(
+    (menu: string) => {
       if (menu) ref.current?.focus();
-      _setMenuOpen(menu);
+      _setMenuStep(menu);
     },
-    [ref],
+    [ref, _setMenuStep],
   );
-  const sheetValue = useEnvelopeSheetValue({
+  const availableValue = useEnvelopeSheetValue({
     name: envelopeBudget.toBudget,
     value: 0,
   });
-  const availableValue = sheetValue;
   if (typeof availableValue !== 'number' && availableValue !== null) {
     throw new Error(
       'Expected availableValue to be a number but got ' + availableValue,
     );
   }
-  const isMenuOpen = Boolean(menuOpen);
-  const contextMenusEnabled = useFeatureFlag('contextMenus');
+
+  const {
+    setMenuOpen,
+    menuOpen,
+    handleContextMenu,
+    resetPosition,
+    position,
+    asContextMenu,
+  } = useContextMenu();
 
   return (
     <>
       <View ref={triggerRef}>
         <ToBudgetAmount
-          onClick={() => setMenuOpen('actions')}
+          onClick={() => {
+            resetPosition();
+            setMenuOpen(true);
+          }}
           prevMonthName={prevMonthName}
           style={style}
           amountStyle={amountStyle}
-          isTotalsListTooltipDisabled={!isCollapsed || isMenuOpen}
-          onContextMenu={e => {
-            if (!contextMenusEnabled) return;
-            e.preventDefault();
-            setMenuOpen('actions');
-          }}
+          isTotalsListTooltipDisabled={!isCollapsed || asContextMenu}
+          onContextMenu={handleContextMenu}
         />
       </View>
 
       <Popover
         triggerRef={triggerRef}
-        placement="bottom"
-        isOpen={isMenuOpen}
-        onOpenChange={() => setMenuOpen(null)}
-        style={{ width: 200 }}
+        placement={asContextMenu ? 'bottom start' : 'bottom'}
+        isOpen={menuOpen}
+        onOpenChange={() => {
+          setMenuStep('actions');
+          setMenuOpen(false);
+        }}
+        style={{ width: 200, margin: 1 }}
         isNonModal
+        {...position}
       >
         <span tabIndex={-1} ref={ref}>
-          {menuOpen === 'actions' && (
+          {menuStep === 'actions' && (
             <ToBudgetMenu
-              onTransfer={() => setMenuOpen('transfer')}
-              onCover={() => setMenuOpen('cover')}
-              onHoldBuffer={() => setMenuOpen('buffer')}
+              onTransfer={() => setMenuStep('transfer')}
+              onCover={() => setMenuStep('cover')}
+              onHoldBuffer={() => setMenuStep('buffer')}
               onResetHoldBuffer={() => {
                 onBudgetAction(month, 'reset-hold');
-                setMenuOpen(null);
+                setMenuOpen(false);
               }}
             />
           )}
-          {menuOpen === 'buffer' && (
+          {menuStep === 'buffer' && (
             <HoldMenu
-              onClose={() => setMenuOpen(null)}
+              onClose={() => setMenuOpen(false)}
               onSubmit={amount => {
                 onBudgetAction(month, 'hold', { amount });
               }}
             />
           )}
-          {menuOpen === 'transfer' && (
+          {menuStep === 'transfer' && (
             <TransferMenu
               initialAmount={availableValue ?? undefined}
-              onClose={() => setMenuOpen(null)}
+              onClose={() => setMenuOpen(false)}
               onSubmit={(amount, categoryId) => {
                 onBudgetAction(month, 'transfer-available', {
                   amount,
@@ -115,10 +124,10 @@ export function ToBudget({
               }}
             />
           )}
-          {menuOpen === 'cover' && (
+          {menuStep === 'cover' && (
             <CoverMenu
               showToBeBudgeted={false}
-              onClose={() => setMenuOpen(null)}
+              onClose={() => setMenuOpen(false)}
               onSubmit={categoryId => {
                 onBudgetAction(month, 'cover-overbudgeted', {
                   category: categoryId,
diff --git a/packages/desktop-client/src/components/common/Popover.tsx b/packages/desktop-client/src/components/common/Popover.tsx
index 79fe2e3f8f0..c844c5b9c9b 100644
--- a/packages/desktop-client/src/components/common/Popover.tsx
+++ b/packages/desktop-client/src/components/common/Popover.tsx
@@ -41,6 +41,7 @@ export const Popover = ({
         ...styles.tooltip,
         ...styles.lightScrollbar,
         padding: 0,
+        userSelect: 'none',
         ...style,
       })}
       shouldCloseOnInteractOutside={element => {
diff --git a/packages/desktop-client/src/components/manager/ConfigServer.tsx b/packages/desktop-client/src/components/manager/ConfigServer.tsx
index 44b13d2e61a..e69e4e16f2b 100644
--- a/packages/desktop-client/src/components/manager/ConfigServer.tsx
+++ b/packages/desktop-client/src/components/manager/ConfigServer.tsx
@@ -111,7 +111,6 @@ export function ConfigServer() {
   async function onCreateTestFile() {
     await setServerUrl(null);
     await createBudget({ testMode: true });
-    window.__navigate('/');
   }
 
   return (
@@ -250,7 +249,10 @@ export function ConfigServer() {
               <Button
                 variant="primary"
                 style={{ marginLeft: 15 }}
-                onPress={onCreateTestFile}
+                onPress={async () => {
+                  await onCreateTestFile();
+                  navigate('/');
+                }}
               >
                 {t('Create test file')}
               </Button>
diff --git a/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx b/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx
index 1d72fea856e..d746aee4de2 100644
--- a/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx
+++ b/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx
@@ -73,7 +73,9 @@ export function AccountTransactions({
             )
           }
           leftContent={<MobileBackButton />}
-          rightContent={<AddTransactionButton accountId={accountId} />}
+          rightContent={
+            <AddTransactionButton accountId={account ? accountId : undefined} />
+          }
         />
       }
       padding={0}
diff --git a/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx b/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx
index cbe373495e1..8005375a412 100644
--- a/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx
+++ b/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx
@@ -156,7 +156,7 @@ export function Status({ status, isSplit }) {
 
 function Footer({
   transactions,
-  adding,
+  isAdding,
   onAdd,
   onSave,
   onSplit,
@@ -232,7 +232,7 @@ function Footer({
             Select account
           </Text>
         </Button>
-      ) : adding ? (
+      ) : isAdding ? (
         <Button
           type="primary"
           style={{ height: styles.mobileMinHeight }}
@@ -436,7 +436,7 @@ const ChildTransactionEdit = forwardRef(
 ChildTransactionEdit.displayName = 'ChildTransactionEdit';
 
 const TransactionEditInner = memo(function TransactionEditInner({
-  adding,
+  isAdding,
   accounts,
   categories,
   payees,
@@ -479,10 +479,10 @@ const TransactionEditInner = memo(function TransactionEditInner({
   const isInitialMount = useInitialMount();
 
   useEffect(() => {
-    if (isInitialMount && adding) {
+    if (isInitialMount && isAdding) {
       onTotalAmountEdit();
     }
-  }, [adding, isInitialMount, onTotalAmountEdit]);
+  }, [isAdding, isInitialMount, onTotalAmountEdit]);
 
   const getAccount = useCallback(
     trans => {
@@ -532,24 +532,12 @@ const TransactionEditInner = memo(function TransactionEditInner({
 
     const onConfirmSave = () => {
       let transactionsToSave = unserializedTransactions;
-      if (adding) {
+      if (isAdding) {
         transactionsToSave = realizeTempTransactions(unserializedTransactions);
       }
 
       onSave(transactionsToSave);
-
-      if (adding || hasAccountChanged.current) {
-        const { account: accountId } = unserializedTransaction;
-        const account = accountsById?.[accountId];
-        if (account) {
-          navigate(`/accounts/${account.id}`, { replace: true });
-        } else {
-          // Handle the case where account is undefined
-          navigate(-1);
-        }
-      } else {
-        navigate(-1);
-      }
+      navigate(-1);
     };
 
     if (unserializedTransaction.reconciled) {
@@ -566,14 +554,7 @@ const TransactionEditInner = memo(function TransactionEditInner({
     } else {
       onConfirmSave();
     }
-  }, [
-    accountsById,
-    adding,
-    dispatch,
-    navigate,
-    onSave,
-    unserializedTransactions,
-  ]);
+  }, [isAdding, dispatch, navigate, onSave, unserializedTransactions]);
 
   const onUpdateInner = useCallback(
     async (serializedTransaction, name, value) => {
@@ -757,7 +738,7 @@ const TransactionEditInner = memo(function TransactionEditInner({
         <MobilePageHeader
           title={
             transaction.payee == null
-              ? adding
+              ? isAdding
                 ? 'New Transaction'
                 : 'Transaction'
               : title
@@ -772,7 +753,7 @@ const TransactionEditInner = memo(function TransactionEditInner({
       footer={
         <Footer
           transactions={transactions}
-          adding={adding}
+          isAdding={isAdding}
           onAdd={onSaveInner}
           onSave={onSaveInner}
           onSplit={onSplit}
@@ -976,7 +957,7 @@ const TransactionEditInner = memo(function TransactionEditInner({
           />
         </View>
 
-        {!adding && (
+        {!isAdding && (
           <View style={{ alignItems: 'center' }}>
             <Button
               onClick={() => onDeleteInner(transaction.id)}
@@ -1042,8 +1023,8 @@ function TransactionEditUnconnected({
   const dispatch = useDispatch();
   const [transactions, setTransactions] = useState([]);
   const [fetchedTransactions, setFetchedTransactions] = useState([]);
-  const adding = useRef(false);
-  const deleted = useRef(false);
+  const isAdding = useRef(false);
+  const isDeleted = useRef(false);
 
   useEffect(() => {
     let unmounted = false;
@@ -1074,7 +1055,7 @@ function TransactionEditUnconnected({
     if (transactionId !== 'new') {
       fetchTransaction();
     } else {
-      adding.current = true;
+      isAdding.current = true;
     }
 
     return () => {
@@ -1083,7 +1064,7 @@ function TransactionEditUnconnected({
   }, [transactionId]);
 
   useEffect(() => {
-    if (adding.current) {
+    if (isAdding.current) {
       setTransactions(
         makeTemporaryTransactions(
           locationState?.accountId || lastTransaction?.account || null,
@@ -1152,7 +1133,7 @@ function TransactionEditUnconnected({
 
   const onSave = useCallback(
     async newTransactions => {
-      if (deleted.current) {
+      if (isDeleted.current) {
         return;
       }
 
@@ -1176,7 +1157,7 @@ function TransactionEditUnconnected({
         // }
       }
 
-      if (adding.current) {
+      if (isAdding.current) {
         // The first one is always the "parent" and the only one we care
         // about
         dispatch(setLastTransaction(newTransactions[0]));
@@ -1189,9 +1170,9 @@ function TransactionEditUnconnected({
     async id => {
       const changes = deleteTransaction(transactions, id);
 
-      if (adding.current) {
+      if (isAdding.current) {
         // Adding a new transactions, this disables saving when the component unmounts
-        deleted.current = true;
+        isDeleted.current = true;
       } else {
         const _remoteUpdates = await send('transactions-batch-update', {
           deleted: changes.diff.deleted,
@@ -1244,7 +1225,7 @@ function TransactionEditUnconnected({
     >
       <TransactionEditInner
         transactions={transactions}
-        adding={adding.current}
+        isAdding={isAdding.current}
         categories={categories}
         accounts={accounts}
         payees={payees}
diff --git a/packages/desktop-client/src/components/modals/manager/ImportActualModal.tsx b/packages/desktop-client/src/components/modals/manager/ImportActualModal.tsx
index d1041250caf..ac31b5757b2 100644
--- a/packages/desktop-client/src/components/modals/manager/ImportActualModal.tsx
+++ b/packages/desktop-client/src/components/modals/manager/ImportActualModal.tsx
@@ -5,6 +5,7 @@ import { useDispatch } from 'react-redux';
 
 import { importBudget } from 'loot-core/src/client/actions/budgets';
 
+import { useNavigate } from '../../../hooks/useNavigate';
 import { styles, theme } from '../../../style';
 import { Block } from '../../common/Block';
 import { ButtonWithLoading } from '../../common/Button2';
@@ -31,7 +32,7 @@ function getErrorMessage(error: string): string {
 
 export function ImportActualModal() {
   const { t } = useTranslation();
-
+  const navigate = useNavigate();
   const dispatch = useDispatch();
   const [error, setError] = useState<string | null>(null);
   const [importing, setImporting] = useState(false);
@@ -46,6 +47,7 @@ export function ImportActualModal() {
       setError(null);
       try {
         await dispatch(importBudget(res[0], 'actual'));
+        navigate('/budget');
       } catch (err) {
         setError(err.message);
       } finally {
diff --git a/packages/desktop-client/src/components/modals/manager/ImportYNAB4Modal.tsx b/packages/desktop-client/src/components/modals/manager/ImportYNAB4Modal.tsx
index 3d02baa794a..2c0a52b9318 100644
--- a/packages/desktop-client/src/components/modals/manager/ImportYNAB4Modal.tsx
+++ b/packages/desktop-client/src/components/modals/manager/ImportYNAB4Modal.tsx
@@ -5,6 +5,7 @@ import { useDispatch } from 'react-redux';
 
 import { importBudget } from 'loot-core/src/client/actions/budgets';
 
+import { useNavigate } from '../../../hooks/useNavigate';
 import { styles, theme } from '../../../style';
 import { Block } from '../../common/Block';
 import { ButtonWithLoading } from '../../common/Button2';
@@ -23,7 +24,7 @@ function getErrorMessage(error: string): string {
 
 export function ImportYNAB4Modal() {
   const { t } = useTranslation();
-
+  const navigate = useNavigate();
   const dispatch = useDispatch();
   const [error, setError] = useState<string | null>(null);
   const [importing, setImporting] = useState(false);
@@ -38,6 +39,7 @@ export function ImportYNAB4Modal() {
       setError(null);
       try {
         await dispatch(importBudget(res[0], 'ynab4'));
+        navigate('/budget');
       } catch (err) {
         setError(err.message);
       } finally {
diff --git a/packages/desktop-client/src/components/modals/manager/ImportYNAB5Modal.tsx b/packages/desktop-client/src/components/modals/manager/ImportYNAB5Modal.tsx
index a17d9ab74b5..98ee2f49fac 100644
--- a/packages/desktop-client/src/components/modals/manager/ImportYNAB5Modal.tsx
+++ b/packages/desktop-client/src/components/modals/manager/ImportYNAB5Modal.tsx
@@ -5,6 +5,7 @@ import { useDispatch } from 'react-redux';
 
 import { importBudget } from 'loot-core/src/client/actions/budgets';
 
+import { useNavigate } from '../../../hooks/useNavigate';
 import { styles, theme } from '../../../style';
 import { Block } from '../../common/Block';
 import { ButtonWithLoading } from '../../common/Button2';
@@ -26,7 +27,7 @@ function getErrorMessage(error: string): string {
 
 export function ImportYNAB5Modal() {
   const { t } = useTranslation();
-
+  const navigate = useNavigate();
   const dispatch = useDispatch();
   const [error, setError] = useState<string | null>(null);
   const [importing, setImporting] = useState(false);
@@ -41,6 +42,7 @@ export function ImportYNAB5Modal() {
       setError(null);
       try {
         await dispatch(importBudget(res[0], 'ynab5'));
+        navigate('/budget');
       } catch (err) {
         setError(err.message);
       } finally {
diff --git a/packages/desktop-client/src/components/payees/PayeeTableRow.tsx b/packages/desktop-client/src/components/payees/PayeeTableRow.tsx
index dce345a3da8..5392c1a435e 100644
--- a/packages/desktop-client/src/components/payees/PayeeTableRow.tsx
+++ b/packages/desktop-client/src/components/payees/PayeeTableRow.tsx
@@ -1,10 +1,10 @@
 // @ts-strict-ignore
-import { memo, useRef, useState, type CSSProperties } from 'react';
+import { memo, useRef, type CSSProperties } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
 import { type PayeeEntity } from 'loot-core/src/types/models';
 
-import { useFeatureFlag } from '../../hooks/useFeatureFlag';
+import { useContextMenu } from '../../hooks/useContextMenu';
 import { useSelectedDispatch } from '../../hooks/useSelected';
 import { SvgArrowThinRight, SvgBookmark } from '../../icons/v1';
 import { theme } from '../../style';
@@ -111,10 +111,8 @@ export const PayeeTableRow = memo(
     const { t } = useTranslation();
 
     const triggerRef = useRef(null);
-    const [menuOpen, setMenuOpen] = useState(false);
-    const [crossOffset, setCrossOffset] = useState(0);
-    const [offset, setOffset] = useState(0);
-    const contextMenusEnabled = useFeatureFlag('contextMenus');
+    const { setMenuOpen, menuOpen, handleContextMenu, position } =
+      useContextMenu();
 
     return (
       <Row
@@ -137,22 +135,14 @@ export const PayeeTableRow = memo(
         }}
         data-focus-key={payee.id}
         onMouseEnter={() => onHover && onHover(payee.id)}
-        onContextMenu={e => {
-          if (!contextMenusEnabled) return;
-          e.preventDefault();
-          setMenuOpen(true);
-          const rect = e.currentTarget.getBoundingClientRect();
-          setCrossOffset(e.clientX - rect.left);
-          setOffset(e.clientY - rect.bottom);
-        }}
+        onContextMenu={handleContextMenu}
       >
         <Popover
           triggerRef={triggerRef}
           placement="bottom start"
           isOpen={menuOpen}
           onOpenChange={() => setMenuOpen(false)}
-          crossOffset={crossOffset}
-          offset={offset}
+          {...position}
           style={{ width: 200, margin: 1 }}
           isNonModal
         >
diff --git a/packages/desktop-client/src/components/reports/ChooseGraph.tsx b/packages/desktop-client/src/components/reports/ChooseGraph.tsx
index e477e6e3491..a743ac84462 100644
--- a/packages/desktop-client/src/components/reports/ChooseGraph.tsx
+++ b/packages/desktop-client/src/components/reports/ChooseGraph.tsx
@@ -137,7 +137,6 @@ export function ChooseGraph({
     return (
       <DonutGraph
         style={graphStyle}
-        compact={compact}
         data={data}
         filters={filters}
         groupBy={groupBy}
diff --git a/packages/desktop-client/src/components/reports/ReportCard.tsx b/packages/desktop-client/src/components/reports/ReportCard.tsx
index 360a16d3ca7..0ee43288083 100644
--- a/packages/desktop-client/src/components/reports/ReportCard.tsx
+++ b/packages/desktop-client/src/components/reports/ReportCard.tsx
@@ -1,12 +1,11 @@
 import React, {
   useRef,
-  useState,
   type ComponentProps,
   type ReactNode,
   type CSSProperties,
 } from 'react';
 
-import { useFeatureFlag } from '../../hooks/useFeatureFlag';
+import { useContextMenu } from '../../hooks/useContextMenu';
 import { useIsInViewport } from '../../hooks/useIsInViewport';
 import { useNavigate } from '../../hooks/useNavigate';
 import { theme } from '../../style';
@@ -121,26 +120,20 @@ type LayoutProps = {
 function Layout({ children, isEditing, menuItems, onMenuSelect }: LayoutProps) {
   const triggerRef = useRef(null);
   const viewRef = useRef(null);
-  const [menuOpen, setMenuOpen] = useState<null | 'context' | 'button'>(null);
-  const [crossOffset, setCrossOffset] = useState(0);
-  const [offset, setOffset] = useState(0);
-  const dashboardsEnabled = useFeatureFlag('dashboards');
-  const contextMenusEnabled =
-    useFeatureFlag('contextMenus') && dashboardsEnabled;
 
-  const isContextMenu = menuOpen === 'context';
+  const {
+    setMenuOpen,
+    menuOpen,
+    handleContextMenu,
+    resetPosition,
+    position,
+    asContextMenu,
+  } = useContextMenu();
 
   return (
     <View
       ref={viewRef}
-      onContextMenu={e => {
-        if (!contextMenusEnabled) return;
-        e.preventDefault();
-        setMenuOpen('context');
-        const rect = e.currentTarget.getBoundingClientRect();
-        setCrossOffset(e.clientX - rect.left);
-        setOffset(e.clientY - rect.bottom);
-      }}
+      onContextMenu={handleContextMenu}
       style={{
         display: 'block',
         height: '100%',
@@ -171,22 +164,20 @@ function Layout({ children, isEditing, menuItems, onMenuSelect }: LayoutProps) {
               <MenuButton
                 ref={triggerRef}
                 onPress={() => {
-                  setCrossOffset(0);
-                  setOffset(0);
-                  setMenuOpen('button');
+                  resetPosition();
+                  setMenuOpen(true);
                 }}
               />
             </View>
           )}
 
           <Popover
-            triggerRef={isContextMenu ? viewRef : triggerRef}
+            triggerRef={asContextMenu ? viewRef : triggerRef}
             isOpen={Boolean(menuOpen)}
-            onOpenChange={() => setMenuOpen(null)}
+            onOpenChange={() => setMenuOpen(false)}
             isNonModal
-            placement={isContextMenu ? 'bottom start' : 'bottom end'}
-            crossOffset={crossOffset}
-            offset={offset}
+            placement={asContextMenu ? 'bottom start' : 'bottom end'}
+            {...position}
           >
             <Menu
               className={NON_DRAGGABLE_AREA_CLASS_NAME}
diff --git a/packages/desktop-client/src/components/reports/graphs/DonutGraph.tsx b/packages/desktop-client/src/components/reports/graphs/DonutGraph.tsx
index 42d3dcb22bf..4dae3d6d88b 100644
--- a/packages/desktop-client/src/components/reports/graphs/DonutGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/DonutGraph.tsx
@@ -38,16 +38,38 @@ const ActiveShapeMobile = props => {
   } = props;
   const yAxis = payload.name ?? payload.date;
 
+  const sin = Math.sin(-RADIAN * 240);
+  const my = cy + outerRadius * sin;
+  const ey = my - 5;
+
   return (
     <g>
-      <text x={cx} y={cy + 70} dy={-8} textAnchor="middle" fill={fill}>
+      <text
+        x={cx}
+        y={cy + outerRadius * Math.sin(-RADIAN * 270) + 15}
+        dy={0}
+        textAnchor="middle"
+        fill={fill}
+      >
         {`${yAxis}`}
       </text>
       <PrivacyFilter>
-        <text x={cx - 40} y={cy + 40} dy={0} textAnchor="end" fill={fill}>
+        <text
+          x={cx + outerRadius * Math.cos(-RADIAN * 240) - 30}
+          y={ey}
+          dy={0}
+          textAnchor="end"
+          fill={fill}
+        >
           {`${amountToCurrency(value)}`}
         </text>
-        <text x={cx + 45} y={cy + 40} dy={0} textAnchor="start" fill="#999">
+        <text
+          x={cx + outerRadius * Math.cos(-RADIAN * 330) + 10}
+          y={ey}
+          dy={0}
+          textAnchor="start"
+          fill="#999"
+        >
           {`${(percent * 100).toFixed(2)}%`}
         </text>
       </PrivacyFilter>
@@ -184,7 +206,6 @@ type DonutGraphProps = {
   filters: RuleConditionEntity[];
   groupBy: string;
   balanceTypeOp: balanceTypeOpType;
-  compact?: boolean;
   viewLabels: boolean;
   showHiddenCategories?: boolean;
   showOffBudget?: boolean;
@@ -197,7 +218,6 @@ export function DonutGraph({
   filters,
   groupBy,
   balanceTypeOp,
-  compact,
   viewLabels,
   showHiddenCategories,
   showOffBudget,
@@ -211,7 +231,7 @@ export function DonutGraph({
   const accounts = useAccounts();
   const [pointer, setPointer] = useState('');
 
-  const getVal = obj => {
+  const getVal = (obj: DataEntity) => {
     if (['totalDebts', 'netDebts'].includes(balanceTypeOp)) {
       return -1 * obj[balanceTypeOp];
     } else {
@@ -221,71 +241,82 @@ export function DonutGraph({
 
   const [activeIndex, setActiveIndex] = useState(0);
 
+  // Sort the data in the pie chart
+  const unsortedData = data[splitData];
+  const sortedData = unsortedData.slice().sort((a, b) => getVal(b) - getVal(a));
+
   return (
-    <Container
-      style={{
-        ...style,
-        ...(compact && { height: 'auto' }),
-      }}
-    >
-      {(width, height) =>
-        data[splitData] && (
-          <ResponsiveContainer>
-            <div>
-              {!compact && <div style={{ marginTop: '15px' }} />}
-              <PieChart
-                width={width}
-                height={height}
-                style={{ cursor: pointer }}
-              >
-                <Pie
-                  activeIndex={activeIndex}
-                  activeShape={compact ? ActiveShapeMobile : ActiveShape}
-                  dataKey={val => getVal(val)}
-                  nameKey={yAxis}
-                  isAnimationActive={false}
-                  data={data[splitData]}
-                  innerRadius={Math.min(width, height) * 0.2}
-                  fill="#8884d8"
-                  labelLine={false}
-                  label={e =>
-                    viewLabels && !compact ? customLabel(e) : <div />
-                  }
-                  onMouseLeave={() => setPointer('')}
-                  onMouseEnter={(_, index) => {
-                    setActiveIndex(index);
-                    if (!['Group', 'Interval'].includes(groupBy)) {
-                      setPointer('pointer');
-                    }
-                  }}
-                  onClick={item =>
-                    ((compact && showTooltip) || !compact) &&
-                    !['Group', 'Interval'].includes(groupBy) &&
-                    showActivity({
-                      navigate,
-                      categories,
-                      accounts,
-                      balanceTypeOp,
-                      filters,
-                      showHiddenCategories,
-                      showOffBudget,
-                      type: 'totals',
-                      startDate: data.startDate,
-                      endDate: data.endDate,
-                      field: groupBy.toLowerCase(),
-                      id: item.id,
-                    })
-                  }
+    <Container style={style}>
+      {(width, height) => {
+        const compact = height <= 300 || width <= 300;
+
+        return (
+          sortedData && (
+            <ResponsiveContainer>
+              <div>
+                {!compact && <div style={{ marginTop: '15px' }} />}
+                <PieChart
+                  width={width}
+                  height={height}
+                  style={{ cursor: pointer }}
                 >
-                  {data.legend.map((entry, index) => (
-                    <Cell key={`cell-${index}`} fill={entry.color} />
-                  ))}
-                </Pie>
-              </PieChart>
-            </div>
-          </ResponsiveContainer>
-        )
-      }
+                  <Pie
+                    activeIndex={activeIndex}
+                    activeShape={
+                      width < 220 || height < 130
+                        ? undefined
+                        : compact
+                          ? ActiveShapeMobile
+                          : ActiveShape
+                    }
+                    dataKey={val => getVal(val)}
+                    nameKey={yAxis}
+                    isAnimationActive={false}
+                    data={sortedData}
+                    innerRadius={Math.min(width, height) * 0.2}
+                    fill="#8884d8"
+                    labelLine={false}
+                    label={e =>
+                      viewLabels && !compact ? customLabel(e) : <div />
+                    }
+                    startAngle={90}
+                    endAngle={-270}
+                    onMouseLeave={() => setPointer('')}
+                    onMouseEnter={(_, index) => {
+                      setActiveIndex(index);
+                      if (!['Group', 'Interval'].includes(groupBy)) {
+                        setPointer('pointer');
+                      }
+                    }}
+                    onClick={item =>
+                      ((compact && showTooltip) || !compact) &&
+                      !['Group', 'Interval'].includes(groupBy) &&
+                      showActivity({
+                        navigate,
+                        categories,
+                        accounts,
+                        balanceTypeOp,
+                        filters,
+                        showHiddenCategories,
+                        showOffBudget,
+                        type: 'totals',
+                        startDate: data.startDate,
+                        endDate: data.endDate,
+                        field: groupBy.toLowerCase(),
+                        id: item.id,
+                      })
+                    }
+                  >
+                    {data.legend.map((entry, index) => (
+                      <Cell key={`cell-${index}`} fill={entry.color} />
+                    ))}
+                  </Pie>
+                </PieChart>
+              </div>
+            </ResponsiveContainer>
+          )
+        );
+      }}
     </Container>
   );
 }
diff --git a/packages/desktop-client/src/components/rules/RuleRow.tsx b/packages/desktop-client/src/components/rules/RuleRow.tsx
index 2c59dcac267..10b67f30320 100644
--- a/packages/desktop-client/src/components/rules/RuleRow.tsx
+++ b/packages/desktop-client/src/components/rules/RuleRow.tsx
@@ -1,5 +1,5 @@
 // @ts-strict-ignore
-import React, { memo, useRef, useState } from 'react';
+import React, { memo, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { v4 as uuid } from 'uuid';
@@ -7,7 +7,7 @@ import { v4 as uuid } from 'uuid';
 import { friendlyOp } from 'loot-core/src/shared/rules';
 import { type RuleEntity } from 'loot-core/src/types/models';
 
-import { useFeatureFlag } from '../../hooks/useFeatureFlag';
+import { useContextMenu } from '../../hooks/useContextMenu';
 import { useSelectedDispatch } from '../../hooks/useSelected';
 import { SvgRightArrow2 } from '../../icons/v0';
 import { styles, theme } from '../../style';
@@ -60,10 +60,8 @@ export const RuleRow = memo(
     const { t } = useTranslation();
 
     const triggerRef = useRef(null);
-    const [menuOpen, setMenuOpen] = useState(false);
-    const [crossOffset, setCrossOffset] = useState(0);
-    const [offset, setOffset] = useState(0);
-    const contextMenusEnabled = useFeatureFlag('contextMenus');
+    const { setMenuOpen, menuOpen, handleContextMenu, position } =
+      useContextMenu();
 
     return (
       <Row
@@ -82,22 +80,14 @@ export const RuleRow = memo(
         collapsed={true}
         onMouseEnter={() => onHover && onHover(rule.id)}
         onMouseLeave={() => onHover && onHover(null)}
-        onContextMenu={e => {
-          if (!contextMenusEnabled) return;
-          e.preventDefault();
-          setMenuOpen(true);
-          const rect = triggerRef.current.getBoundingClientRect();
-          setCrossOffset(e.clientX - rect.left);
-          setOffset(e.clientY - rect.bottom);
-        }}
+        onContextMenu={handleContextMenu}
       >
         <Popover
           triggerRef={triggerRef}
           placement="bottom start"
           isOpen={menuOpen}
           onOpenChange={() => setMenuOpen(false)}
-          crossOffset={crossOffset}
-          offset={offset}
+          {...position}
           style={{ width: 200, margin: 1 }}
           isNonModal
         >
diff --git a/packages/desktop-client/src/components/schedules/SchedulesTable.tsx b/packages/desktop-client/src/components/schedules/SchedulesTable.tsx
index 2d65f595667..e3a1782db6d 100644
--- a/packages/desktop-client/src/components/schedules/SchedulesTable.tsx
+++ b/packages/desktop-client/src/components/schedules/SchedulesTable.tsx
@@ -13,8 +13,8 @@ import { integerToCurrency } from 'loot-core/src/shared/util';
 import { type ScheduleEntity } from 'loot-core/src/types/models';
 
 import { useAccounts } from '../../hooks/useAccounts';
+import { useContextMenu } from '../../hooks/useContextMenu';
 import { useDateFormat } from '../../hooks/useDateFormat';
-import { useFeatureFlag } from '../../hooks/useFeatureFlag';
 import { usePayees } from '../../hooks/usePayees';
 import { SvgDotsHorizontalTriple } from '../../icons/v1';
 import { SvgCheck } from '../../icons/v2';
@@ -186,10 +186,14 @@ function ScheduleRow({
 
   const rowRef = useRef(null);
   const buttonRef = useRef(null);
-  const [open, setOpen] = useState<false | 'contextMenu' | 'button'>(false);
-  const [crossOffset, setCrossOffset] = useState(0);
-  const [offset, setOffset] = useState(0);
-  const contextMenusEnabled = useFeatureFlag('contextMenus');
+  const {
+    setMenuOpen,
+    menuOpen,
+    handleContextMenu,
+    resetPosition,
+    position,
+    asContextMenu,
+  } = useContextMenu();
 
   return (
     <Row
@@ -203,25 +207,16 @@ function ScheduleRow({
         color: theme.tableText,
         ':hover': { backgroundColor: theme.tableRowBackgroundHover },
       }}
-      onContextMenu={e => {
-        if (!contextMenusEnabled) return;
-        if (minimal) return;
-        e.preventDefault();
-        const rect = e.currentTarget.getBoundingClientRect();
-        setCrossOffset(e.clientX - rect.left);
-        setOffset(e.clientY - rect.bottom);
-        setOpen('contextMenu');
-      }}
+      onContextMenu={handleContextMenu}
     >
       {!minimal && (
         <Popover
-          triggerRef={open === 'contextMenu' ? rowRef : buttonRef}
-          isOpen={!!open}
-          onOpenChange={() => setOpen(false)}
+          triggerRef={asContextMenu ? rowRef : buttonRef}
+          isOpen={menuOpen}
+          onOpenChange={() => setMenuOpen(false)}
           isNonModal
           placement="bottom start"
-          crossOffset={open === 'contextMenu' ? crossOffset : 0}
-          offset={open === 'contextMenu' ? offset : 0}
+          {...position}
           style={{ margin: 1 }}
         >
           <OverflowMenu
@@ -229,7 +224,8 @@ function ScheduleRow({
             status={statuses.get(schedule.id)}
             onAction={(action, id) => {
               onAction(action, id);
-              setOpen(false);
+              resetPosition();
+              setMenuOpen(false);
             }}
           />
         </Popover>
@@ -276,7 +272,8 @@ function ScheduleRow({
               variant="bare"
               aria-label={t('Menu')}
               onPress={() => {
-                setOpen('button');
+                resetPosition();
+                setMenuOpen(true);
               }}
             >
               <SvgDotsHorizontalTriple
diff --git a/packages/desktop-client/src/components/settings/BudgetTypeSettings.tsx b/packages/desktop-client/src/components/settings/BudgetTypeSettings.tsx
index ea249b80273..8edf78716c2 100644
--- a/packages/desktop-client/src/components/settings/BudgetTypeSettings.tsx
+++ b/packages/desktop-client/src/components/settings/BudgetTypeSettings.tsx
@@ -46,7 +46,7 @@ export function BudgetTypeSettings() {
         relying on current available funds.{' '}
         <Link
           variant="external"
-          to="https://actualbudget.org/docs/experimental/tracking-budget"
+          to="https://actualbudget.org/docs/getting-started/tracking-budget"
           linkColor="purple"
         >
           {t('Learn more…')}
diff --git a/packages/desktop-client/src/components/transactions/TransactionsTable.jsx b/packages/desktop-client/src/components/transactions/TransactionsTable.jsx
index 152bed07a88..34c684b4721 100644
--- a/packages/desktop-client/src/components/transactions/TransactionsTable.jsx
+++ b/packages/desktop-client/src/components/transactions/TransactionsTable.jsx
@@ -47,7 +47,7 @@ import {
   titleFirst,
 } from 'loot-core/src/shared/util';
 
-import { useFeatureFlag } from '../../hooks/useFeatureFlag';
+import { useContextMenu } from '../../hooks/useContextMenu';
 import { useMergedRefs } from '../../hooks/useMergedRefs';
 import { usePrevious } from '../../hooks/usePrevious';
 import { useProperFocus } from '../../hooks/useProperFocus';
@@ -1048,10 +1048,8 @@ const Transaction = memo(function Transaction({
     }, 1);
   }, [splitError, allTransactions]);
 
-  const [menuOpen, setMenuOpen] = useState(false);
-  const [crossOffset, setCrossOffset] = useState(0);
-  const [offset, setOffset] = useState(0);
-  const contextMenusEnabled = useFeatureFlag('contextMenus');
+  const { setMenuOpen, menuOpen, handleContextMenu, position } =
+    useContextMenu();
 
   return (
     <Row
@@ -1081,23 +1079,14 @@ const Transaction = memo(function Transaction({
         }),
         ...(_unmatched && { opacity: 0.5 }),
       }}
-      onContextMenu={e => {
-        if (!contextMenusEnabled) return;
-        if (transaction.id === 'temp') return;
-        e.preventDefault();
-        const rect = e.currentTarget.getBoundingClientRect();
-        setCrossOffset(e.clientX - rect.left);
-        setOffset(e.clientY - rect.bottom);
-        setMenuOpen(true);
-      }}
+      onContextMenu={handleContextMenu}
     >
       <Popover
         triggerRef={triggerRef}
         placement="bottom start"
         isOpen={menuOpen}
         onOpenChange={() => setMenuOpen(false)}
-        crossOffset={crossOffset}
-        offset={offset}
+        {...position}
         style={{ width: 200, margin: 1 }}
         isNonModal
       >
@@ -1361,6 +1350,9 @@ const Transaction = memo(function Transaction({
                 margin: '0 5px',
                 padding: '3px 7px',
                 borderRadius: 4,
+                overflow: 'hidden',
+                textOverflow: 'ellipsis',
+                display: 'inline-block',
               }}
             >
               {titleFirst(categoryId)}
diff --git a/packages/desktop-client/src/hooks/useAccountPreviewTransactions.ts b/packages/desktop-client/src/hooks/useAccountPreviewTransactions.ts
index ca1471c999b..d66e7687224 100644
--- a/packages/desktop-client/src/hooks/useAccountPreviewTransactions.ts
+++ b/packages/desktop-client/src/hooks/useAccountPreviewTransactions.ts
@@ -32,10 +32,6 @@ export function useAccountPreviewTransactions({
   const payees = usePayees();
 
   const previewTransactions = useMemo(() => {
-    if (isLoading) {
-      return [];
-    }
-
     if (!accountId) {
       return originalPreviewTransactions;
     }
@@ -50,9 +46,12 @@ export function useAccountPreviewTransactions({
           a => a.id === payees.find(p => p.id === payeeId)?.transfer_acct,
         ),
     });
-  }, [accountId, accounts, isLoading, originalPreviewTransactions, payees]);
+  }, [accountId, accounts, originalPreviewTransactions, payees]);
 
-  return { isLoading, previewTransactions };
+  return {
+    isLoading,
+    previewTransactions,
+  };
 }
 
 type AccountPreviewProps = {
diff --git a/packages/desktop-client/src/hooks/useContextMenu.ts b/packages/desktop-client/src/hooks/useContextMenu.ts
new file mode 100644
index 00000000000..69bbd0bd8ce
--- /dev/null
+++ b/packages/desktop-client/src/hooks/useContextMenu.ts
@@ -0,0 +1,40 @@
+import { type MouseEventHandler, useState } from 'react';
+
+import { useFeatureFlag } from './useFeatureFlag';
+
+export function useContextMenu() {
+  const [menuOpen, setMenuOpen] = useState(false);
+  const [asContextMenu, setAsContextMenu] = useState(false);
+  const [position, setPosition] = useState({ crossOffset: 0, offset: 0 });
+  const contextMenusEnabled = useFeatureFlag('contextMenus');
+
+  const handleContextMenu: MouseEventHandler<HTMLElement> = e => {
+    if (!contextMenusEnabled) return;
+
+    e.preventDefault();
+    setAsContextMenu(true);
+
+    const rect = e.currentTarget.getBoundingClientRect();
+    setPosition({
+      crossOffset: e.clientX - rect.left,
+      offset: e.clientY - rect.bottom,
+    });
+    setMenuOpen(true);
+  };
+
+  const resetPosition = (crossOffset = 0, offset = 0) => {
+    setPosition({ crossOffset, offset });
+  };
+
+  return {
+    menuOpen,
+    setMenuOpen: (open: boolean) => {
+      setMenuOpen(open);
+      setAsContextMenu(false);
+    },
+    position,
+    handleContextMenu,
+    resetPosition,
+    asContextMenu,
+  };
+}
diff --git a/packages/desktop-electron/package.json b/packages/desktop-electron/package.json
index db7550e480b..ced422a10fc 100644
--- a/packages/desktop-electron/package.json
+++ b/packages/desktop-electron/package.json
@@ -3,7 +3,7 @@
   "author": "Actual",
   "productName": "Actual",
   "description": "A simple and powerful personal finance system",
-  "version": "24.11.0",
+  "version": "24.12.0",
   "scripts": {
     "clean": "rm -rf dist",
     "update-client": "bin/update-client",
diff --git a/packages/loot-core/src/client/actions/budgets.ts b/packages/loot-core/src/client/actions/budgets.ts
index 96dc92434a2..5ce240a64b8 100644
--- a/packages/loot-core/src/client/actions/budgets.ts
+++ b/packages/loot-core/src/client/actions/budgets.ts
@@ -161,7 +161,6 @@ export function importBudget(
     dispatch(closeModal());
 
     await dispatch(loadPrefs());
-    window.__navigate('/budget');
   };
 }
 
diff --git a/packages/loot-core/src/server/accounts/sync.ts b/packages/loot-core/src/server/accounts/sync.ts
index adf9a2fdfca..aedf1e4f80f 100644
--- a/packages/loot-core/src/server/accounts/sync.ts
+++ b/packages/loot-core/src/server/accounts/sync.ts
@@ -32,8 +32,8 @@ import { title } from './title';
 import { runRules } from './transaction-rules';
 import { batchUpdateTransactions } from './transactions';
 
-function BankSyncError(type: string, code: string) {
-  return { type: 'BankSyncError', category: type, code };
+function BankSyncError(type: string, code: string, details?: object) {
+  return { type: 'BankSyncError', category: type, code, details };
 }
 
 function makeSplitTransaction(trans, subtransactions) {
@@ -152,7 +152,11 @@ async function downloadGoCardlessTransactions(
   );
 
   if (res.error_code) {
-    throw BankSyncError(res.error_type, res.error_code);
+    const errorDetails = {
+      rateLimitHeaders: res.rateLimitHeaders,
+    };
+
+    throw BankSyncError(res.error_type, res.error_code, errorDetails);
   }
 
   if (includeBalance) {
diff --git a/packages/loot-core/src/shared/rules.ts b/packages/loot-core/src/shared/rules.ts
index c5de63ce591..cbfe591964f 100644
--- a/packages/loot-core/src/shared/rules.ts
+++ b/packages/loot-core/src/shared/rules.ts
@@ -21,7 +21,6 @@ const TYPE_INFO = {
       'isNot',
       'doesNotContain',
       'notOneOf',
-      'hasTags',
     ],
     nullable: true,
   },
diff --git a/upcoming-release-notes/3381.md b/upcoming-release-notes/3381.md
deleted file mode 100644
index 473ac8dc30c..00000000000
--- a/upcoming-release-notes/3381.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [UnderKoen]
----
-
-Context menu's for transactions, budget, schedules, payees and rules pages
diff --git a/upcoming-release-notes/3402.md b/upcoming-release-notes/3402.md
deleted file mode 100644
index a9717b796fc..00000000000
--- a/upcoming-release-notes/3402.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [joel-jeremy]
----
-
-Fix wrong scheduled transfer payment direction on PWA
diff --git a/upcoming-release-notes/3548.md b/upcoming-release-notes/3548.md
deleted file mode 100644
index 55f83991cbd..00000000000
--- a/upcoming-release-notes/3548.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [a-gradina]
----
-
-Support translations in various files.
diff --git a/upcoming-release-notes/3571.md b/upcoming-release-notes/3571.md
deleted file mode 100644
index 244655708a7..00000000000
--- a/upcoming-release-notes/3571.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [The-Firexx]
----
-
-Fixes focus ring getting "stuck" on last column of /accounts/budgeted screen when creating a new transaction.
\ No newline at end of file
diff --git a/upcoming-release-notes/3581.md b/upcoming-release-notes/3581.md
deleted file mode 100644
index 484e12a0cf5..00000000000
--- a/upcoming-release-notes/3581.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [matt-fidd]
----
-
-Enable all SimpleFin accounts to be synced with a single request
diff --git a/upcoming-release-notes/3593.md b/upcoming-release-notes/3593.md
deleted file mode 100644
index 34c47854473..00000000000
--- a/upcoming-release-notes/3593.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [tlesicka]
----
-
-Refactored Sidebar components. Budget rename input box is now responsive.
diff --git a/upcoming-release-notes/3666.md b/upcoming-release-notes/3666.md
deleted file mode 100644
index 84bcde22291..00000000000
--- a/upcoming-release-notes/3666.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [Dreptschar]
----
-
-Adds a Button to Group Menu that allows users to apply all Budget Templates in this Group
diff --git a/upcoming-release-notes/3669.md b/upcoming-release-notes/3669.md
deleted file mode 100644
index 4e5ba539dcd..00000000000
--- a/upcoming-release-notes/3669.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [qedi-r]
----
-
-Fix category filters when the value is '(nothing)'
diff --git a/upcoming-release-notes/3670.md b/upcoming-release-notes/3670.md
deleted file mode 100644
index 2e658ceec84..00000000000
--- a/upcoming-release-notes/3670.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [glorenzen]
----
-
-Support translations in packages/desktop-client/src/components/payees/PayeeMenu.tsx.
\ No newline at end of file
diff --git a/upcoming-release-notes/3685.md b/upcoming-release-notes/3685.md
deleted file mode 100644
index 4e1528ff2c8..00000000000
--- a/upcoming-release-notes/3685.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [joel-jeremy]
----
-
-Create a new useTransactions hook to simplify loading of transactions.
diff --git a/upcoming-release-notes/3686.md b/upcoming-release-notes/3686.md
deleted file mode 100644
index 63858b96836..00000000000
--- a/upcoming-release-notes/3686.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [joel-rich]
----
-
-Fixes #3682 - Fix $ne filters incorrectly excluding null values
diff --git a/upcoming-release-notes/3693.md b/upcoming-release-notes/3693.md
deleted file mode 100644
index c6c3969d814..00000000000
--- a/upcoming-release-notes/3693.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [jfdoming]
----
-
-Auto-reload on app updates if possible, and show a notification if not possible
diff --git a/upcoming-release-notes/3729.md b/upcoming-release-notes/3729.md
deleted file mode 100644
index a4278e8e67a..00000000000
--- a/upcoming-release-notes/3729.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [joel-jeremy]
----
-
-Fix mobile/desktop views not change when window is resized (e.g. from portrait to landscape and vice versa)
diff --git a/upcoming-release-notes/3731.md b/upcoming-release-notes/3731.md
deleted file mode 100644
index 03e59a6d5e2..00000000000
--- a/upcoming-release-notes/3731.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [joel-jeremy]
----
-
-Fix mobile navigation tabs scrolling when scrolling anywhere in the app e.g. scrolling through category/group notes in mobile budget view.
diff --git a/upcoming-release-notes/3732.md b/upcoming-release-notes/3732.md
deleted file mode 100644
index 5717114e139..00000000000
--- a/upcoming-release-notes/3732.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [lelemm]
----
-
-Fix #2932: Schedule reset amount to ten (10) when amount is zero (0).
diff --git a/upcoming-release-notes/3744.md b/upcoming-release-notes/3744.md
deleted file mode 100644
index d1a4081d4c1..00000000000
--- a/upcoming-release-notes/3744.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MatissJanis]
----
-
-Custom reports: moving from session storage and local state for inner report pages to using unique URL identifiers for each custom report page.
diff --git a/upcoming-release-notes/3745.md b/upcoming-release-notes/3745.md
deleted file mode 100644
index 86ab28c5c37..00000000000
--- a/upcoming-release-notes/3745.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [MatissJanis]
----
-
-Dashboards: save cash-flow balance setting with the widget.
diff --git a/upcoming-release-notes/3748.md b/upcoming-release-notes/3748.md
deleted file mode 100644
index 836ac2d65a0..00000000000
--- a/upcoming-release-notes/3748.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [UnderKoen]
----
-
-Keep the order of imported transactions when syncing from server.
diff --git a/upcoming-release-notes/3752.md b/upcoming-release-notes/3752.md
deleted file mode 100644
index 057317c6822..00000000000
--- a/upcoming-release-notes/3752.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [awaisalee]
----
-
-Enhance app with i18n translations
diff --git a/upcoming-release-notes/3753.md b/upcoming-release-notes/3753.md
deleted file mode 100644
index ae36fcc9605..00000000000
--- a/upcoming-release-notes/3753.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [JahJoey]
----
-
-Fixed overflowing text on transaction records when imported payee has an extra long name
diff --git a/upcoming-release-notes/3754.md b/upcoming-release-notes/3754.md
deleted file mode 100644
index a2ecd8f273b..00000000000
--- a/upcoming-release-notes/3754.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [youngcw]
----
-
-Reorganize goal template code
diff --git a/upcoming-release-notes/3757.md b/upcoming-release-notes/3757.md
deleted file mode 100644
index 078e427ca13..00000000000
--- a/upcoming-release-notes/3757.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [joel-jeremy]
----
-
-Migrate AccountSyncCheck.jsx file to typescript
diff --git a/upcoming-release-notes/3761.md b/upcoming-release-notes/3761.md
deleted file mode 100644
index 49f87f5fc0e..00000000000
--- a/upcoming-release-notes/3761.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [joel-jeremy]
----
-
-Migrate mobile Transaction component to TypeScript (TransactionListItem.tsx) + cleanup
diff --git a/upcoming-release-notes/3764.md b/upcoming-release-notes/3764.md
deleted file mode 100644
index e61ae13018c..00000000000
--- a/upcoming-release-notes/3764.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [UnderKoen]
----
-
-Add `/update-vrt` as a command for PR's.
diff --git a/upcoming-release-notes/3775.md b/upcoming-release-notes/3775.md
new file mode 100644
index 00000000000..dc711646600
--- /dev/null
+++ b/upcoming-release-notes/3775.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [UnderKoen]
+---
+
+Position context menus on the to budget page to the cursor, and make popovers non selectable.
diff --git a/upcoming-release-notes/3782.md b/upcoming-release-notes/3782.md
deleted file mode 100644
index 2d166681ee1..00000000000
--- a/upcoming-release-notes/3782.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MikesGlitch]
----
-
-Removing node-fetch from the Desktop app and updating self signed certificate implementation
diff --git a/upcoming-release-notes/3785.md b/upcoming-release-notes/3785.md
deleted file mode 100644
index 32636250752..00000000000
--- a/upcoming-release-notes/3785.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MatissJanis]
----
-
-Dashboards: add migration that will remove faulty 'blank' widgets.
diff --git a/upcoming-release-notes/3792.md b/upcoming-release-notes/3792.md
deleted file mode 100644
index 86f09da230f..00000000000
--- a/upcoming-release-notes/3792.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Features
-authors: [lelemm]
----
-
-Add a summary card to report dashboard
diff --git a/upcoming-release-notes/3793.md b/upcoming-release-notes/3793.md
deleted file mode 100644
index ee9ad3ea9d0..00000000000
--- a/upcoming-release-notes/3793.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [thraizz]
----
-
-Handle unexpected response from GoCardless when getting banks.
diff --git a/upcoming-release-notes/3794.md b/upcoming-release-notes/3794.md
deleted file mode 100644
index 7d447c810fa..00000000000
--- a/upcoming-release-notes/3794.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [tlesicka]
----
-
-Fixes typescript and runtime error from useResponsive update.
diff --git a/upcoming-release-notes/3801.md b/upcoming-release-notes/3801.md
deleted file mode 100644
index f2c5878e5f2..00000000000
--- a/upcoming-release-notes/3801.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MikesGlitch]
----
-
-Update build folder structure to allow separation of web and electron builds
diff --git a/upcoming-release-notes/3815.md b/upcoming-release-notes/3815.md
deleted file mode 100644
index 6cc28a49956..00000000000
--- a/upcoming-release-notes/3815.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [joshyrobot]
----
-
-Allow server URLs to contain pathnames.
diff --git a/upcoming-release-notes/3817.md b/upcoming-release-notes/3817.md
deleted file mode 100644
index 66ac69a9531..00000000000
--- a/upcoming-release-notes/3817.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [youngcw]
----
-
-Fix template goals after recent rewrite
diff --git a/upcoming-release-notes/3821.md b/upcoming-release-notes/3821.md
deleted file mode 100644
index 82685535180..00000000000
--- a/upcoming-release-notes/3821.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [matt-fidd]
----
-
-Implement SimpleFin batch sync in the API
diff --git a/upcoming-release-notes/3823.md b/upcoming-release-notes/3823.md
deleted file mode 100644
index ee79dbc1cbb..00000000000
--- a/upcoming-release-notes/3823.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [MikesGlitch]
----
-
-Fix Iphone 13 error when attempting to view budget.
diff --git a/upcoming-release-notes/3825.md b/upcoming-release-notes/3825.md
deleted file mode 100644
index f13d3bfcd27..00000000000
--- a/upcoming-release-notes/3825.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [JukeboxRhino]
----
-
-Fix back button behavior after adding a new transaction on mobile
diff --git a/upcoming-release-notes/3827.md b/upcoming-release-notes/3827.md
deleted file mode 100644
index 057317c6822..00000000000
--- a/upcoming-release-notes/3827.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [awaisalee]
----
-
-Enhance app with i18n translations
diff --git a/upcoming-release-notes/3829.md b/upcoming-release-notes/3829.md
deleted file mode 100644
index 316a9ffb0db..00000000000
--- a/upcoming-release-notes/3829.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [youngcw]
----
-
-Fix template limits
diff --git a/upcoming-release-notes/3830.md b/upcoming-release-notes/3830.md
deleted file mode 100644
index a4ca4e25fda..00000000000
--- a/upcoming-release-notes/3830.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MikesGlitch]
----
-
-Fix broken translations in worker files
diff --git a/upcoming-release-notes/3832.md b/upcoming-release-notes/3832.md
deleted file mode 100644
index 057317c6822..00000000000
--- a/upcoming-release-notes/3832.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [awaisalee]
----
-
-Enhance app with i18n translations
diff --git a/upcoming-release-notes/3833.md b/upcoming-release-notes/3833.md
deleted file mode 100644
index 49ef283f9bb..00000000000
--- a/upcoming-release-notes/3833.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Features
-authors: [MatissJanis]
----
-
-Release tracking budget feature.
diff --git a/upcoming-release-notes/3837.md b/upcoming-release-notes/3837.md
deleted file mode 100644
index 45e9c109ab9..00000000000
--- a/upcoming-release-notes/3837.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [shb9019]
----
-
-Fix validation issue for invalid server URLs in /config-server page
diff --git a/upcoming-release-notes/3841.md b/upcoming-release-notes/3841.md
deleted file mode 100644
index 5d897fc304c..00000000000
--- a/upcoming-release-notes/3841.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MikesGlitch]
----
-
-Fix translations parameter formatting issues
diff --git a/upcoming-release-notes/3855.md b/upcoming-release-notes/3855.md
new file mode 100644
index 00000000000..028980feeff
--- /dev/null
+++ b/upcoming-release-notes/3855.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [MatissJanis]
+---
+
+Dashboards: sort pie-chart according to balances; add more spacing for labels.
diff --git a/upcoming-release-notes/3856.md b/upcoming-release-notes/3856.md
deleted file mode 100644
index a661c206b33..00000000000
--- a/upcoming-release-notes/3856.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Features
-authors: [MatissJanis]
----
-
-Dashboards: release as first party feature.
diff --git a/upcoming-release-notes/3859.md b/upcoming-release-notes/3859.md
deleted file mode 100644
index 66a14a5d037..00000000000
--- a/upcoming-release-notes/3859.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [joel-jeremy]
----
-
-Strict TS typing for useResizeObserver.ts
diff --git a/upcoming-release-notes/3860.md b/upcoming-release-notes/3860.md
deleted file mode 100644
index bab5f68baf0..00000000000
--- a/upcoming-release-notes/3860.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [joel-jeremy]
----
-
-Convert ManagementApp to tsx
diff --git a/upcoming-release-notes/3862.md b/upcoming-release-notes/3862.md
deleted file mode 100644
index 1181cd0fa2d..00000000000
--- a/upcoming-release-notes/3862.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [joel-jeremy]
----
-
-Convert mobile Accounts.jsx to Typescript.
diff --git a/upcoming-release-notes/3864.md b/upcoming-release-notes/3864.md
deleted file mode 100644
index 837da8dc6a0..00000000000
--- a/upcoming-release-notes/3864.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [joel-jeremy]
----
-
-Use strict typing in useSheetValue and fix bug where query is not being updated when the query object changed
diff --git a/upcoming-release-notes/3865.md b/upcoming-release-notes/3865.md
deleted file mode 100644
index e96ae65ef23..00000000000
--- a/upcoming-release-notes/3865.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [joel-jeremy]
----
-
-Convert EditFieldModal.jsx to tsx
diff --git a/upcoming-release-notes/3866.md b/upcoming-release-notes/3866.md
deleted file mode 100644
index c25073385c8..00000000000
--- a/upcoming-release-notes/3866.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [joel-jeremy]
----
-
-Convert MergeUnusedPayeesModal.jsx to tsx
diff --git a/upcoming-release-notes/3867.md b/upcoming-release-notes/3867.md
deleted file mode 100644
index ce526edc354..00000000000
--- a/upcoming-release-notes/3867.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [joel-jeremy]
----
-
-Convert ManagePayees page components to Typescript
diff --git a/upcoming-release-notes/3868.md b/upcoming-release-notes/3868.md
deleted file mode 100644
index df94b3528dc..00000000000
--- a/upcoming-release-notes/3868.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [joel-jeremy]
----
-
-Convert PostsOfflineNotification.jsx to Typescript
diff --git a/upcoming-release-notes/3870.md b/upcoming-release-notes/3870.md
deleted file mode 100644
index 9744036bac0..00000000000
--- a/upcoming-release-notes/3870.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [joel-jeremy]
----
-
-Convert SimpleTransactionsTable.jsx to tsx
diff --git a/upcoming-release-notes/3871.md b/upcoming-release-notes/3871.md
deleted file mode 100644
index 086300043c5..00000000000
--- a/upcoming-release-notes/3871.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MikesGlitch]
----
-
-Summary Report: Update font size implementation to be simpler
diff --git a/upcoming-release-notes/3872.md b/upcoming-release-notes/3872.md
deleted file mode 100644
index 36b7eb872a9..00000000000
--- a/upcoming-release-notes/3872.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [matt-fidd]
----
-
-Allow report table columns to grow to fit available space
diff --git a/upcoming-release-notes/3873.md b/upcoming-release-notes/3873.md
deleted file mode 100644
index a1843db3a31..00000000000
--- a/upcoming-release-notes/3873.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [joel-jeremy]
----
-
-Fix preview transactions not showing in all accounts and aggregated accounts (budgeted/offbudget)
diff --git a/upcoming-release-notes/3880.md b/upcoming-release-notes/3880.md
new file mode 100644
index 00000000000..dd3d83f6601
--- /dev/null
+++ b/upcoming-release-notes/3880.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [ericji1326]
+---
+
+Fix bug where menu option icon disappearing completely on certain screen sizes.
diff --git a/upcoming-release-notes/3882.md b/upcoming-release-notes/3882.md
deleted file mode 100644
index 9059395e154..00000000000
--- a/upcoming-release-notes/3882.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [MikesGlitch]
----
-
-Fix performance regression around accounts and budget pages
diff --git a/upcoming-release-notes/3895.md b/upcoming-release-notes/3895.md
new file mode 100644
index 00000000000..91e2afe4714
--- /dev/null
+++ b/upcoming-release-notes/3895.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [matt-fidd]
+---
+
+Add more logging for GoCardless rate limit information
diff --git a/upcoming-release-notes/3906.md b/upcoming-release-notes/3906.md
new file mode 100644
index 00000000000..72f3c03008d
--- /dev/null
+++ b/upcoming-release-notes/3906.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [annechoww]
+---
+
+Fix bug where category labels are not scaling correctly on small screens
diff --git a/upcoming-release-notes/3944.md b/upcoming-release-notes/3944.md
new file mode 100644
index 00000000000..5d73da1eeec
--- /dev/null
+++ b/upcoming-release-notes/3944.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [adamhl8]
+---
+
+Fix tracking budget docs link in settings.