diff --git a/src/app/features/take-a-break/take-a-break.service.ts b/src/app/features/take-a-break/take-a-break.service.ts index ec4c11e836..12af64de1c 100644 --- a/src/app/features/take-a-break/take-a-break.service.ts +++ b/src/app/features/take-a-break/take-a-break.service.ts @@ -26,7 +26,6 @@ import { GlobalConfigState, TakeABreakConfig } from '../config/global-config.mod import { T } from '../../t.const'; import { NotifyService } from '../../core/notify/notify.service'; import { UiHelperService } from '../ui-helper/ui-helper.service'; -import { WorkContextService } from '../work-context/work-context.service'; import { Tick } from '../../core/global-tracking-interval/tick.model'; import { ofType } from '@ngrx/effects'; import { idleDialogResult, triggerResetBreakTimer } from '../idle/store/idle.actions'; @@ -57,7 +56,6 @@ export class TakeABreakService { private _idleService = inject(IdleService); private _actions$ = inject(LOCAL_ACTIONS); private _configService = inject(GlobalConfigService); - private _workContextService = inject(WorkContextService); private _notifyService = inject(NotifyService); private _bannerService = inject(BannerService); private _chromeExtensionInterfaceService = inject(ChromeExtensionInterfaceService); @@ -296,8 +294,8 @@ export class TakeABreakService { time: msToString(cfg.takeABreak.takeABreakSnoozeTime), }, action: { - label: T.F.TIME_TRACKING.B.ALREADY_DID, - fn: () => this.resetTimerAndCountAsBreak(), + label: T.F.FOCUS_MODE.START_BREAK, + fn: () => this.startBreak(), }, action2: { label: T.F.TIME_TRACKING.B.SNOOZE, @@ -324,13 +322,9 @@ export class TakeABreakService { this._triggerManualReset$.next(0); } - resetTimerAndCountAsBreak(): void { - const min5 = 1000 * 60 * 5; - this._workContextService.addToBreakTimeForActiveContext(undefined, min5); + startBreak(): void { + this._taskService.pauseCurrent(); this.resetTimer(); - - this._triggerLockScreenCounter$.next(false); - this._triggerFullscreenBlocker$.next(false); } private _createMessage(duration: number, cfg: TakeABreakConfig): string | undefined { diff --git a/src/app/t.const.ts b/src/app/t.const.ts index ad07be20b4..6c833a6284 100644 --- a/src/app/t.const.ts +++ b/src/app/t.const.ts @@ -1964,7 +1964,6 @@ const T = { }, TIME_TRACKING: { B: { - ALREADY_DID: 'F.TIME_TRACKING.B.ALREADY_DID', SNOOZE: 'F.TIME_TRACKING.B.SNOOZE' }, B_TTR: { diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 68d9817d0e..964a289910 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1964,7 +1964,6 @@ }, "TIME_TRACKING": { "B": { - "ALREADY_DID": "I already did", "SNOOZE": "Snooze {{time}}" }, "B_TTR": {