diff --git a/packages/desktop-client/e2e/page-models/navigation.js b/packages/desktop-client/e2e/page-models/navigation.js index 00a6d801d0..248db6444b 100644 --- a/packages/desktop-client/e2e/page-models/navigation.js +++ b/packages/desktop-client/e2e/page-models/navigation.js @@ -57,6 +57,9 @@ export class Navigation { async createAccount(data) { await this.page.getByRole('button', { name: 'Add account' }).click(); + await this.page + .getByRole('button', { name: 'Create local account' }) + .click(); // Fill the form await this.page.getByLabel('Name:').fill(data.name); @@ -66,7 +69,9 @@ export class Navigation { await this.page.getByLabel('Off-budget').click(); } - await this.page.getByRole('button', { name: 'Create' }).click(); + await this.page + .getByRole('button', { name: 'Create', exact: true }) + .click(); return new AccountPage(this.page); } diff --git a/packages/desktop-client/src/components/SidebarWithData.js b/packages/desktop-client/src/components/SidebarWithData.js index 909c12677c..d38be20d0b 100644 --- a/packages/desktop-client/src/components/SidebarWithData.js +++ b/packages/desktop-client/src/components/SidebarWithData.js @@ -10,7 +10,6 @@ import * as Platform from 'loot-core/src/client/platform'; import * as queries from 'loot-core/src/client/queries'; import { send } from 'loot-core/src/platform/client/fetch'; -import useFeatureFlag from '../hooks/useFeatureFlag'; import ExpandArrow from '../icons/v0/ExpandArrow'; import { styles, colors } from '../style'; @@ -119,8 +118,6 @@ function SidebarWithData({ saveGlobalPrefs, getAccounts, }) { - const syncAccount = useFeatureFlag('syncAccount'); - useEffect(() => void getAccounts(), [getAccounts]); async function onReorder(id, dropPos, targetId) { @@ -146,9 +143,7 @@ function SidebarWithData({ getOffBudgetBalance={queries.offbudgetAccountBalance} onFloat={() => saveGlobalPrefs({ floatingSidebar: !floatingSidebar })} onReorder={onReorder} - onAddAccount={() => - replaceModal(syncAccount ? 'add-account' : 'add-local-account') - } + onAddAccount={() => replaceModal('add-account')} showClosedAccounts={prefs['ui.showClosedAccounts']} onToggleClosedAccounts={() => savePrefs({ diff --git a/packages/desktop-client/src/components/accounts/Account.js b/packages/desktop-client/src/components/accounts/Account.js index 7c25affc3d..26c60b4163 100644 --- a/packages/desktop-client/src/components/accounts/Account.js +++ b/packages/desktop-client/src/components/accounts/Account.js @@ -34,7 +34,6 @@ import { groupById, } from 'loot-core/src/shared/util'; -import useFeatureFlag from '../../hooks/useFeatureFlag'; import { SelectedProviderWithItems, useSelectedItems, @@ -264,7 +263,6 @@ function MenuTooltip({ onClose, children }) { function AccountMenu({ account, canSync, - syncEnabled, showBalances, canShowBalances, showCleared, @@ -302,8 +300,7 @@ function AccountMenu({ }, { name: 'export', text: 'Export' }, { name: 'reconcile', text: 'Reconcile' }, - syncEnabled && - account && + account && !account.closed && (canSync ? { @@ -672,7 +669,6 @@ const AccountHeader = memo( accountsSyncing, accounts, transactions, - syncEnabled, showBalances, showExtraBalances, showCleared, @@ -709,7 +705,7 @@ const AccountHeader = memo( let searchInput = useRef(null); let splitsExpanded = useSplitsExpanded(); - let canSync = syncEnabled && account && account.account_id; + let canSync = account && account.account_id; if (!account) { // All accounts - check for any syncable account canSync = !!accounts.find(account => !!account.account_id); @@ -976,7 +972,6 @@ const AccountHeader = memo( showEmptyMessage ? ( - replaceModal( - syncEnabled ? 'add-account' : 'add-local-account', - ) - } + onAdd={() => replaceModal('add-account')} /> ) : !loading ? ( Connect to an Actual server to set up{' '} diff --git a/packages/desktop-client/src/components/settings/Experimental.js b/packages/desktop-client/src/components/settings/Experimental.js index 61d0b9660c..23a2821193 100644 --- a/packages/desktop-client/src/components/settings/Experimental.js +++ b/packages/desktop-client/src/components/settings/Experimental.js @@ -41,16 +41,6 @@ export default function ExperimentalFeatures({ prefs, savePrefs }) { -