Skip to content

Commit

Permalink
fix: remove YNABFEATURES check (#3188)
Browse files Browse the repository at this point in the history
  • Loading branch information
joshmadewell committed Aug 1, 2023
1 parent 697a019 commit 49727fe
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
1 change: 0 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"windowReload": true,
"ynab": true,
"ynabToolKit": true,
"YNABFEATURES": true,
"browser": true,
"Components": true,
"__ynabapp__": true
Expand Down
14 changes: 8 additions & 6 deletions src/extension/features/budget/toggle-master-categories/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Feature } from 'toolkit/extension/features/feature';
import { getBudgetService, isCurrentRouteBudgetPage } from 'toolkit/extension/utils/ynab';
import { getEmberView } from 'toolkit/extension/utils/ember';
import { controllerLookup, getEmberView } from 'toolkit/extension/utils/ember';
import { getToolkitStorageKey, setToolkitStorageKey } from 'toolkit/extension/utils/toolkit';

export class ToggleMasterCategories extends Feature {
Expand Down Expand Up @@ -56,7 +56,10 @@ export class ToggleMasterCategories extends Feature {
if (getToolkitStorageKey('catSoloMode', false)) {
this.handleToggleSoloMode(event);
} else {
getBudgetService().send('toggleCollapseMasterCategories', !this.isAnyCategoryCollapsed);
controllerLookup('budget').send(
'toggleCollapseMasterCategories',
!this.isAnyCategoryCollapsed
);
}

this.updateToggleIcon();
Expand Down Expand Up @@ -88,10 +91,9 @@ export class ToggleMasterCategories extends Feature {
this.handleRowExpandedToggle
);

const budgetController = getBudgetService();
budgetController.send('toggleCollapseMasterCategories', true);
budgetController.budgetMonthDisplayItems
.find(({ isMasterCategory }) => isMasterCategory)
controllerLookup('budget').send('toggleCollapseMasterCategories', true);
getBudgetService()
.budgetMonthDisplayItems.find(({ isMasterCategory }) => isMasterCategory)
?.set('isCollapsed', false);
}

Expand Down
3 changes: 1 addition & 2 deletions src/extension/utils/ynab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ export function isYNABReady() {
return (
typeof $ !== 'undefined' &&
!$('.ember-view.is-loading').length &&
typeof ynabToolKit !== 'undefined' &&
typeof YNABFEATURES !== 'undefined'
typeof ynabToolKit !== 'undefined'
);
}
3 changes: 1 addition & 2 deletions src/types/window.d.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { YNABApp, YNABGlobal } from './ynab/window';
import { YNABGlobal } from './ynab/window';
import { YNABToolkitObject } from './toolkit';

declare global {
const ynab: YNABGlobal;
const ynabToolKit: YNABToolkitObject;
const YNABFEATURES: any;
const __toolkitUtils: unknown;

interface Window {
Expand Down

0 comments on commit 49727fe

Please sign in to comment.