Merge branch 'develop'

src/main/ui/static/analysis/templates/riskEvent_detail.html

@@ -281,9 +281,9 @@
                                                 <tr ng-repeat="trade in tradeLogs"
                                                     ng-class="{warning:trade.clearing_status==2}">
                                                     <td>{{trade.order_id}}</td>
-                                                    <td>{{trade.total_amount | currency: trade.currency}}</td>
+                                                    <td>{{trade.currency}} {{trade.total_amount}}</td>
-                                                    <td ng-bind="trade.display_amount | currency: trade.currency"></td>
+                                                    <td>{{trade.currency}} {{trade.display_amount}}</td>
-                                                    <td ng-bind="trade.clearing_amount | currency: 'AUD'"></td>
+                                                    <td>AUD {{trade.clearing_amount}}</td>
                                                     <td>
                                                 <span ng-if="(trade.channel != 'hf') && (trade.channel != 'Rpay')"
                                                       ng-bind="trade.exchange_rate">

src/main/ui/static/analysis/templates/riskEvent_detail_bd.html

@@ -27,9 +27,9 @@
                         <tr ng-repeat="trade in tradeLogs"
                             ng-class="{warning:trade.clearing_status==2}">
                             <td>{{trade.order_id}}</td>
-                            <td>{{trade.total_amount | currency: trade.currency}}</td>
+                            <td>{{trade.currency}} {{trade.total_amount}}</td>
-                            <td ng-bind="trade.display_amount | currency: trade.currency"></td>
+                            <td>{{trade.currency}} {{trade.display_amount}}</td>
-                            <td ng-bind="trade.clearing_amount | currency: 'AUD'"></td>
+                            <td>AUD {{trade.clearing_amount}}</td>
                             <td>
                                 <span ng-if="(trade.channel != 'hf') && (trade.channel != 'Rpay')"
                                       ng-bind="trade.exchange_rate">