MCKIN-2175 Remove popup html on clearResult call and add popup text only to answer it pertains to

mentoring/public/js/questionnaire.js

@@ -53,7 +53,7 @@ function MessageView(element, mentoring) {
             }
         },
         clearResult: function() {
-            this.allPopupsDOM.hide();
+            this.allPopupsDOM.html('').hide();
             this.allResultsDOM.removeClass(
                 'checkmark-incorrect icon-exclamation fa-exclamation checkmark-correct icon-ok fa-check'
             );
@@ -101,7 +101,7 @@ function MCQBlock(runtime, element, mentoring) {
                     choiceResultDOM.addClass('checkmark-incorrect icon-exclamation fa-exclamation');
                 }
 
-                if (result.tips) {
+                if (result.tips && choiceInputDOM.val() === result.submission) {
                     mentoring.setContent(choiceTipsDOM, result.tips);
                 }