Merge remote-tracking branch 'github-magento/MAGETWO-91563' into EPAM-PR-16

Author: nikshostko

app/code/Magento/Checkout/Controller/Cart/UpdatePost.php

@@ -1,15 +1,18 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Checkout\Controller\Cart;
 
 use Magento\Checkout\Model\Cart\RequestQuantityProcessor;
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 
-class UpdatePost extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface
+/**
+ * Post update shopping cart.
+ */
+class UpdatePost extends \Magento\Checkout\Controller\Cart implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @var RequestQuantityProcessor

app/code/Magento/GiftMessage/view/frontend/web/js/view/gift-message.js

@@ -31,17 +31,16 @@ define([
 
             this.itemId = this.itemId || 'orderLevel';
             model = new GiftMessage(this.itemId);
-            giftOptions.addOption(model);
             this.model = model;
+            this.isResultBlockVisible();
+            giftOptions.addOption(model);
 
             this.model.getObservable('isClear').subscribe(function (value) {
                 if (value == true) { //eslint-disable-line eqeqeq
                     self.formBlockVisibility(false);
                     self.model.getObservable('alreadyAdded')(true);
                 }
             });
-
-            this.isResultBlockVisible();
         },
 
         /**