fix send icon merge botch, encryption icons logic

inlined the isPushDestination check to explicitly tie encrypted icons to the isEncryptedConversation variable

the git rebase ate up an important change from the protocol branch, fixed that and confirmed reality matched expectation.