Merge pull request #1489 from negar-binary/negar/fix_financial_assessment

negar/fix_financial_assessment

Author: ashkanx

src/javascript/binary/base/page.js

@@ -774,7 +774,7 @@ Header.prototype = {
       }
     },
     qualify_for_risk_classification: function() {
-      if (page.client.is_logged_in && !page.client.is_virtual() && page.client.residence !== 'jp' && !$('body').hasClass('BlueTopBack') &&
+      if (page.client.is_logged_in && !page.client.is_virtual() && page.client.residence !== 'jp' && !$('body').hasClass('BlueTopBack') && $('#assessment_form').length === 0 &&
           (localStorage.getItem('reality_check.ack') === '1' || !localStorage.getItem('reality_check.interval'))) {
               return true;
       }

src/javascript/binary/websocket_pages/socket.js

@@ -252,7 +252,7 @@ function BinarySocketClass() {
                     }
                   }
                 } else if (type === 'get_financial_assessment' && !response.hasOwnProperty('error')) {
-                  if (objectNotEmpty(response.get_financial_assessment)) {
+                  if (!objectNotEmpty(response.get_financial_assessment)) {
                     if (page.header.qualify_for_risk_classification() && localStorage.getItem('risk_classification.response') === 'high') {
                       localStorage.setItem('risk_classification', 'high');
                       page.header.check_risk_classification();