Merge remote-tracking branch 'origin/MC-33494' into 2.4.1-develop-pr25

Author: serhii-balko

app/code/Magento/Braintree/view/adminhtml/web/js/vault.js

@@ -131,7 +131,7 @@ define([
             this.createPublicHashSelector();
 
             this.$selector.find('[name="payment[public_hash]"]').val(this.publicHash);
-            this.$container.find('#' + this.getNonceSelectorName()).val(nonce);
+            $('#' + this.getNonceSelectorName()).val(nonce);
         },
 
         /**
@@ -140,7 +140,7 @@ define([
         createPublicHashSelector: function () {
             var $input;
 
-            if (this.$container.find('#' + this.getNonceSelectorName()).size() === 0) {
+            if ($('#' + this.getNonceSelectorName()).length === 0) {
                 $input = $('<input>').attr(
                     {
                         type: 'hidden',
@@ -149,7 +149,7 @@ define([
                     }
                 );
 
-                $input.appendTo(this.$container);
+                $input.appendTo($('#edit_form'));
                 $input.prop('disabled', false);
             }
         },

app/code/Magento/Vault/view/adminhtml/web/js/vault.js

@@ -27,18 +27,26 @@ define([
          * @returns {exports.initObservable}
          */
         initObservable: function () {
-            var self = this;
+            var self = this,
+                paymentSelector = '[name="payment[method]"][value="' + this.getCode() + '"]:checked';
 
             self.$selector = $('#' + self.selector);
             this._super()
                 .observe(['active']);
 
+            if (self.$selector.find(paymentSelector).length !== 0) {
+                this.active(true);
+            }
+
+            $('#' + self.fieldset).find('[name="payment[token_switcher]"]')
+                .on('click', this.rememberTokenSwitcher.bind(this));
+
             // re-init payment method events
             self.$selector.off('changePaymentMethod.' + this.getCode())
                 .on('changePaymentMethod.' + this.getCode(), this.changePaymentMethod.bind(this));
 
             if (this.active()) {
-                $('#' + this.fieldset + ' input:radio:first').trigger('click');
+                this.chooseTokenSwitcher();
             }
 
             return this;
@@ -56,6 +64,33 @@ define([
             return this;
         },
 
+        /**
+         * Save last chosen token switcher
+         * @param {Object} event
+         * @returns {exports.rememberTokenSwitcher}
+         */
+        rememberTokenSwitcher: function (event) {
+            $('#' + this.selector).data('lastTokenSwitcherId', event.target.id);
+
+            return this;
+        },
+
+        /**
+         * Select token switcher
+         * @returns {exports.chooseTokenSwitcher}
+         */
+        chooseTokenSwitcher: function () {
+            var lastTokenSwitcherId = $('#' + this.selector).data('lastTokenSwitcherId');
+
+            if (lastTokenSwitcherId) {
+                $('#' + lastTokenSwitcherId).trigger('click');
+            } else {
+                $('#' + this.fieldset + ' input:radio:first').trigger('click');
+            }
+
+            return this;
+        },
+
         /**
          * Triggered when payment changed
          * @param {Boolean} isActive
@@ -66,8 +101,7 @@ define([
 
                 return;
             }
-
-            $('#' + this.fieldset + ' input:radio:first').trigger('click');
+            this.chooseTokenSwitcher();
             window.order.addExcludedPaymentMethod(this.getCode());
         },