Skip to content

Commit

Permalink
Fix lint errors
Browse files Browse the repository at this point in the history
Co-authored-by: wec43 <[email protected]>
  • Loading branch information
rezbyte and wec43 committed Aug 2, 2024
1 parent f34bcf9 commit 6b5f03c
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 24 deletions.
10 changes: 8 additions & 2 deletions buildSrc/DevBuild.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
44 changes: 22 additions & 22 deletions src/mail-app/settings/NotificationSettingsViewer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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),
]),
Expand Down

0 comments on commit 6b5f03c

Please sign in to comment.