Updated email sender.  Removed boolean value and replaced with alert.tradetypes
Merge commit 'd8d4f1d399f353402ed36582fc4d3fc4c7ab2140'