fix(prefs): Fix selector for default account for send

This commit is contained in:
Juan Tejada 2016-02-01 17:57:12 -08:00
parent 65a29a250c
commit 06062fdfe8
2 changed files with 5 additions and 4 deletions

View file

@ -15,14 +15,14 @@ class SendingSection extends React.Component
values = accounts.map (acc) -> acc.id
labels = accounts.map (acc) -> acc.me().toString()
values = [null, values...]
values = ['selected-mailbox', values...]
labels = ['Account of selected mailbox', labels...]
_.extend(configSchema.properties.sending.properties, {
defaultAccountIdForSend:
type: 'string'
title: 'Send new messages from'
default: null
default: 'selected-mailbox'
enum: values
enumLabels: labels
})

View file

@ -371,8 +371,9 @@ class DraftStore
_getAccountForNewMessage: =>
defAccountId = NylasEnv.config.get('core.sending.defaultAccountIdForSend')
if defAccountId?
AccountStore.accountForId(defAccountId)
account = AccountStore.accountForId(defAccountId)
if account
account
else
focusedAccountId = FocusedPerspectiveStore.current().accountIds[0]
if focusedAccountId