From 433b143005962a0c9a0513e98f7936d00e8acce2 Mon Sep 17 00:00:00 2001 From: dillon Date: Tue, 8 Sep 2015 10:27:50 -0700 Subject: [PATCH] fix(composer-view): always show subject, unless replyToMessageId exists. fixes T3495. Summary: add showing subject when replyToMessageId exists Test Plan: added test. all previous tests remain green. Reviewers: bengotow, evan Reviewed By: evan Maniphest Tasks: T3495 Differential Revision: https://phab.nylas.com/D1989 --- internal_packages/composer/lib/composer-view.cjsx | 3 ++- internal_packages/composer/spec/composer-view-spec.cjsx | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/internal_packages/composer/lib/composer-view.cjsx b/internal_packages/composer/lib/composer-view.cjsx index c120aea07..d86eacdbe 100644 --- a/internal_packages/composer/lib/composer-view.cjsx +++ b/internal_packages/composer/lib/composer-view.cjsx @@ -497,7 +497,8 @@ class ComposerView extends React.Component draft = @_proxy.draft() if _.isEmpty(draft.subject ? "") then return true else if @isForwardedMessage() then return true - else return false + else if draft.replyToMessageId then return false + else return true _shouldAcceptDrop: (event) => # Ensure that you can't pick up a file and drop it on the same draft diff --git a/internal_packages/composer/spec/composer-view-spec.cjsx b/internal_packages/composer/spec/composer-view-spec.cjsx index 4dcb15e36..14e2a0419 100644 --- a/internal_packages/composer/spec/composer-view-spec.cjsx +++ b/internal_packages/composer/spec/composer-view-spec.cjsx @@ -246,15 +246,15 @@ describe "populated composer", -> makeComposer.call @ expect(@composer._shouldShowSubject()).toBe true - it "doesn't show subject when subject has fwd text in it", -> - useDraft.call @, subject: "Trick fwd" + it "doesn't show subject when replyToMessageId exists", -> + useDraft.call @, subject: "should hide", replyToMessageId: "some-id" makeComposer.call @ expect(@composer._shouldShowSubject()).toBe false - it "doesn't show the subject otherwise", -> + it "shows the subject otherwise", -> useDraft.call @, subject: "Foo bar baz" makeComposer.call @ - expect(@composer._shouldShowSubject()).toBe false + expect(@composer._shouldShowSubject()).toBe true describe "when deciding whether or not to show cc and bcc", -> it "doesn't show cc when there's no one to cc", ->