diff --git a/buildSrc/DevBuild.js b/buildSrc/DevBuild.js index b616fe74cd40..2dee716930b2 100644 --- a/buildSrc/DevBuild.js +++ b/buildSrc/DevBuild.js @@ -195,10 +195,16 @@ globalThis.buildOptions.sqliteNativePath = "./better-sqlite3.node";`, await runStep("Desktop: assets", async () => { const desktopIconsPath = "./resources/desktop-icons" await fs.copy(desktopIconsPath, `./${buildDir}/desktop/resources/icons`, { overwrite: true }) - await fs.move(`./${buildDir}/build/desktop/resources/icons/logo-solo-dev.png`, `./${buildDir}/build/desktop/resources/icons/logo-solo-red.png`, { overwrite: true }) - await fs.move(`./${buildDir}/build/desktop/resources/icons/logo-solo-dev-small.png`, `./${buildDir}/build/desktop/resources/icons/logo-solo-red-small.png`, { + await fs.move(`./${buildDir}/build/desktop/resources/icons/logo-solo-dev.png`, `./${buildDir}/build/desktop/resources/icons/logo-solo-red.png`, { overwrite: true, }) + await fs.move( + `./${buildDir}/build/desktop/resources/icons/logo-solo-dev-small.png`, + `./${buildDir}/build/desktop/resources/icons/logo-solo-red-small.png`, + { + overwrite: true, + }, + ) const templateGenerator = (await import("./electron-package-json-template.js")).default const packageJSON = await templateGenerator({ nameSuffix: "-debug", diff --git a/src/mail-app/settings/NotificationSettingsViewer.ts b/src/mail-app/settings/NotificationSettingsViewer.ts index 2cb0a5fe1ee7..b9f6e00046ad 100644 --- a/src/mail-app/settings/NotificationSettingsViewer.ts +++ b/src/mail-app/settings/NotificationSettingsViewer.ts @@ -59,34 +59,34 @@ export class NotificationSettingsViewer implements UpdatableSettingsViewer { ]) const rows = this.identifiers - .map((identifier) => { - const isCurrentDevice = (isApp() || isDesktop()) && identifier.identifier === this.currentIdentifier - - return m(IdentifierRow, { - name: this.identifierDisplayName(isCurrentDevice, identifier.pushServiceType, identifier.displayName), - disabled: identifier.disabled, - identifier: identifier.identifier, - current: isCurrentDevice, - removeClicked: () => { - locator.entityClient.erase(identifier).catch(ofClass(NotFoundError, noOp)) - }, - formatIdentifier: identifier.pushServiceType !== PushServiceType.EMAIL, - disableClicked: () => this.disableIdentifier(identifier), - }) - }) - .sort((l, r) => +r.attrs.current - +l.attrs.current) + .map((identifier) => { + const isCurrentDevice = (isApp() || isDesktop()) && identifier.identifier === this.currentIdentifier + + return m(IdentifierRow, { + name: this.identifierDisplayName(isCurrentDevice, identifier.pushServiceType, identifier.displayName), + disabled: identifier.disabled, + identifier: identifier.identifier, + current: isCurrentDevice, + removeClicked: () => { + locator.entityClient.erase(identifier).catch(ofClass(NotFoundError, noOp)) + }, + formatIdentifier: identifier.pushServiceType !== PushServiceType.EMAIL, + disableClicked: () => this.disableIdentifier(identifier), + }) + }) + .sort((l, r) => +r.attrs.current - +l.attrs.current) return m(".fill-absolute.scroll.plr-l.pb-xl", [ m(".flex.col", [ m(".flex-space-between.items-center.mt-l.mb-s", [m(".h4", lang.get("notificationSettings_action"))]), this.extendedNotificationMode ? m(NotificationContentSelector, { - extendedNotificationMode: this.extendedNotificationMode, - onChange: (value: ExtendedNotificationMode) => { - locator.pushService.setExtendedNotificationMode(value) - this.extendedNotificationMode = value - }, - }) + extendedNotificationMode: this.extendedNotificationMode, + onChange: (value: ExtendedNotificationMode) => { + locator.pushService.setExtendedNotificationMode(value) + this.extendedNotificationMode = value + }, + }) : null, m(NotificationTargetsList, { rows, rowAdd, onExpandedChange: this.expanded } satisfies NotificationTargetsListAttrs), ]),