From ba74c3edd70fa9ef55efcc010ba561fd6533e32b Mon Sep 17 00:00:00 2001
From: Serhiy Shkolyarenko <sshkolyarenko@ebay.com>
Date: Fri, 26 Jun 2015 18:21:27 +0300
Subject: [PATCH] MAGETWO-39289: Estimate Shipping and Tax is affects first
 checkout step(summary bock)

after-merge fix
---
 .../view/frontend/web/js/action/gift-options.js           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/GiftMessage/view/frontend/web/js/action/gift-options.js b/app/code/Magento/GiftMessage/view/frontend/web/js/action/gift-options.js
index 4896aeb00b5..51e72540458 100644
--- a/app/code/Magento/GiftMessage/view/frontend/web/js/action/gift-options.js
+++ b/app/code/Magento/GiftMessage/view/frontend/web/js/action/gift-options.js
@@ -7,10 +7,10 @@ define(
     [
         '../model/url-builder',
         'mage/storage',
-        'Magento_Ui/js/model/errorlist',
+        'Magento_Ui/js/model/messageList',
         'mage/url'
     ],
-    function(urlBuilder, storage, errorList, url) {
+    function(urlBuilder, storage, messageList, url) {
         "use strict";
         return function(giftMessage, remove) {
             url.setBaseUrl(giftMessage.getConfigValue('baseUrl'));
@@ -30,7 +30,7 @@ define(
                     );
                 }
             }
-            errorList.clear();
+            messageList.clear();
 
             storage.post(
                 serviceUrl,
@@ -49,7 +49,7 @@ define(
             ).fail(
                 function(response) {
                     var error = JSON.parse(response.responseText);
-                    errorList.add(error);
+                    messageList.addErrorMessage(error);
                 }
             );
         };
-- 
GitLab