Skip to content

Commit 5f2c6b5

Browse files
committed
Minor tweaks
1 parent f0627e9 commit 5f2c6b5

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

lib/routes-ui.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7306,7 +7306,10 @@ ${Buffer.from(data.content, 'base64url').toString('base64')}
73067306
(accountData.oauth2 && accountData.oauth2.provider) ||
73077307
(gateways && gateways.gateways && gateways.gateways.length)
73087308
),
7309-
canUseSmtp: !!(accountData.smtp || (accountData.oauth2 && accountData.oauth2.provider)),
7309+
canUseSmtp: !!(
7310+
accountData.smtp ||
7311+
(accountData.oauth2 && (accountData.oauth2.provider || (accountData.oauth2.auth && accountData.oauth2.auth.delegatedAccount)))
7312+
),
73107313
gateways: gateways && gateways.gateways,
73117314

73127315
testSendTemplate: cachedTemplates.testSend,

views/accounts/account.hbs

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -277,11 +277,18 @@
277277
<dt class="col-sm-3">Change subscription</dt>
278278
<dd class="col-sm-9">
279279

280-
<span
281-
class="badge badge-pill badge-{{#if account.outlookSubscription.isValid}}success{{else}}danger{{/if}}"
282-
style="cursor:default;" {{#if account.outlookSubscription.state.error}} data-toggle="popover"
283-
data-trigger="hover" data-title="Subscription error"
284-
data-content="{{account.outlookSubscription.state.error}}" {{/if}}>
280+
<span class="badge badge-pill
281+
{{#if account.outlookSubscription.isValid}}
282+
badge-success
283+
{{else}}
284+
{{#if account.outlookSubscription.state.error}}
285+
badge-danger
286+
{{else}}
287+
badge-warning
288+
{{/if}}
289+
{{/if}}
290+
" style="cursor:default;" {{#if account.outlookSubscription.state.error}} data-toggle="popover" data-trigger="hover"
291+
data-title="Subscription error" data-content="{{account.outlookSubscription.state.error}}" {{/if}}>
285292
{{account.outlookSubscription.stateLabel}}
286293
</span>
287294

0 commit comments

Comments
 (0)