From 06062fdfe8dbfcd7f98a5a46f5a9eaac8495850c Mon Sep 17 00:00:00 2001 From: Juan Tejada Date: Mon, 1 Feb 2016 17:57:12 -0800 Subject: [PATCH] fix(prefs): Fix selector for default account for send --- internal_packages/preferences/lib/tabs/sending-section.cjsx | 4 ++-- src/flux/stores/draft-store.coffee | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/internal_packages/preferences/lib/tabs/sending-section.cjsx b/internal_packages/preferences/lib/tabs/sending-section.cjsx index 83cdb3911..cb0d29375 100644 --- a/internal_packages/preferences/lib/tabs/sending-section.cjsx +++ b/internal_packages/preferences/lib/tabs/sending-section.cjsx @@ -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 }) diff --git a/src/flux/stores/draft-store.coffee b/src/flux/stores/draft-store.coffee index f50e00db8..d68ca90ef 100644 --- a/src/flux/stores/draft-store.coffee +++ b/src/flux/stores/draft-store.coffee @@ -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