diff --git a/src/javascript/app/Constants/contract.js b/src/javascript/app/Constants/contract.js
index 0342684e9009..9271274322ea 100644
--- a/src/javascript/app/Constants/contract.js
+++ b/src/javascript/app/Constants/contract.js
@@ -71,7 +71,7 @@ export const getUnsupportedContracts = () => ({
     },
 });
 
-const getContractConfig = is_high_low => ({
+export const getSupportedContracts = is_high_low => ({
     CALL: {
         name    : is_high_low ?  localize('Higher') : localize('Rise'),
         position: 'top',
@@ -120,6 +120,10 @@ const getContractConfig = is_high_low => ({
         name    : localize('No Touch'),
         position: 'bottom',
     },
+});
+
+const getContractConfig = is_high_low => ({
+    ...getSupportedContracts(is_high_low),
     ...getUnsupportedContracts(),
 });
 
diff --git a/src/javascript/app/Modules/Reports/Containers/profit-table.jsx b/src/javascript/app/Modules/Reports/Containers/profit-table.jsx
index 43b55ba29a12..3a484a6b6394 100644
--- a/src/javascript/app/Modules/Reports/Containers/profit-table.jsx
+++ b/src/javascript/app/Modules/Reports/Containers/profit-table.jsx
@@ -8,7 +8,7 @@ import { website_name }                  from 'App/Constants/app-config';
 import DataTable                         from 'App/Components/Elements/DataTable';
 import Localize                          from 'App/Components/Elements/localize.jsx';
 import { getContractPath }               from 'App/Components/Routes/helpers';
-import { getUnsupportedContracts }       from 'Constants';
+import { getSupportedContracts }         from 'Constants';
 import { connect }                       from 'Stores/connect';
 import EmptyTradeHistoryMessage          from '../Components/empty-trade-history-message.jsx';
 import PlaceholderComponent              from '../Components/placeholder-component.jsx';
@@ -26,8 +26,9 @@ class ProfitTable extends React.Component {
     }
 
     getRowAction = (row_obj) => (
-        getUnsupportedContracts()[getMarketInformation(row_obj).category.toUpperCase()] ?
-            {
+        getSupportedContracts()[getMarketInformation(row_obj).category.toUpperCase()] ?
+            getContractPath(row_obj.contract_id)
+            : {
                 component: (
                     <Localize
                         str='This trade type is currently not supported on [_1]. Please go to [_2]Binary.com[_3] for details.'
@@ -38,7 +39,6 @@ class ProfitTable extends React.Component {
                     />
                 ),
             }
-            : getContractPath(row_obj.contract_id)
     );
 
     render () {
diff --git a/src/javascript/app/Modules/Reports/Containers/statement.jsx b/src/javascript/app/Modules/Reports/Containers/statement.jsx
index f772aa2b4bf8..66e0c900992c 100644
--- a/src/javascript/app/Modules/Reports/Containers/statement.jsx
+++ b/src/javascript/app/Modules/Reports/Containers/statement.jsx
@@ -8,7 +8,7 @@ import DataTable                            from 'App/Components/Elements/DataTa
 import Localize                             from 'App/Components/Elements/localize.jsx';
 import { getContractPath }                  from 'App/Components/Routes/helpers';
 import { website_name }                     from 'App/Constants/app-config';
-import { getUnsupportedContracts }          from 'Constants';
+import { getSupportedContracts }            from 'Constants';
 import { connect }                          from 'Stores/connect';
 import { getStatementTableColumnsTemplate } from '../Constants/data-table-constants';
 import PlaceholderComponent                 from '../Components/placeholder-component.jsx';
@@ -29,8 +29,9 @@ class Statement extends React.Component {
         let action;
 
         if (row_obj.id && ['buy', 'sell'].includes(row_obj.action_type)) {
-            action = getUnsupportedContracts()[getMarketInformation(row_obj).category.toUpperCase()] ?
-                {
+            action = getSupportedContracts()[getMarketInformation(row_obj).category.toUpperCase()] ?
+                getContractPath(row_obj.id)
+                : {
                     component: (
                         <Localize
                             str='This trade type is currently not supported on [_1]. Please go to [_2]Binary.com[_3] for details.'
@@ -40,8 +41,7 @@ class Statement extends React.Component {
                             }}
                         />
                     ),
-                }
-                : getContractPath(row_obj.id);
+                };
         } else if (['deposit', 'withdrawal'].includes(row_obj.action_type)) {
             action = {
                 message: row_obj.desc,
diff --git a/src/javascript/app/Modules/Reports/Helpers/market-underyling.js b/src/javascript/app/Modules/Reports/Helpers/market-underyling.js
index c7dd2b065c59..c34988a411fe 100644
--- a/src/javascript/app/Modules/Reports/Helpers/market-underyling.js
+++ b/src/javascript/app/Modules/Reports/Helpers/market-underyling.js
@@ -1,11 +1,15 @@
 export const getMarketInformation = (payload) => {
+    const market_info = {
+        category  : '',
+        underlying: '',
+    };
+
     const pattern = new RegExp('^([A-Z]+)_((OTC_[A-Z0-9]+)|R_[\\d]{2,3}|[A-Z]+)_'); // Used to get market name from shortcode
     const extracted = pattern.exec(payload.shortcode);
     if (extracted !== null) {
-        return {
-            category  : extracted[1].toLowerCase(),
-            underlying: extracted[2],
-        };
+        market_info.category   = extracted[1].toLowerCase();
+        market_info.underlying = extracted[2];
     }
-    return null;
+
+    return market_info;
 };