Merge remote-tracking branch 'origin/MAGETWO-52786' into MPI-BUGFIXES

Author: viktym

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js

@@ -24,7 +24,8 @@ define([
                  * {String}
                  */
                 id: 'co-transparent-form-braintree'
-            }
+            },
+            isValidCardNumber: false
         },
 
         /**
@@ -113,11 +114,7 @@ define([
                 }
 
                 if (event.target.fieldKey === 'number' && event.card) {
-                    if (event.isValid) {
-                        self.cardNumber = event.card;
-                    } else {
-                        self.cardNumber = null;
-                    }
+                    self.isValidCardNumber = event.isValid;
                     self.selectedCardType(
                         validator.getMageCardType(event.card.type, self.getCcAvailableTypes())
                     );
@@ -137,7 +134,7 @@ define([
 
             $selector.removeClass(invalidClass);
 
-            if (this.selectedCardType() === null) {
+            if (this.selectedCardType() === null || !this.isValidCardNumber) {
                 $(this.getSelector('cc_number')).addClass(invalidClass);
 
                 return false;