Correct label for the "Notes for this Order" dropdown

Author: michielgerritsen

app/code/Magento/Sales/Model/Order/Config.php

@@ -206,6 +206,7 @@ public function getStateStatuses($state, $addLabels = true)
             return $this->stateStatuses[$key];
         }
         $statuses = [];
+        $area = $this->state->getAreaCode();
 
         if (!is_array($state)) {
             $state = [$state];
@@ -217,7 +218,7 @@ public function getStateStatuses($state, $addLabels = true)
                 foreach ($collection as $item) {
                     $status = $item->getData('status');
                     if ($addLabels) {
-                        $statuses[$status] = $item->getStoreLabel();
+                        $statuses[$status] = $area == 'adminhtml' ? $item->getLabel() : $item->getStoreLabel();
                     } else {
                         $statuses[] = $status;
                     }

app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml

@@ -5,7 +5,7 @@
  */
 
 // @codingStandardsIgnoreFile
-
+/** @var \Magento\Sales\Block\Adminhtml\Order\View\History $block */
 ?>
 <div id="order_history_block" class="edit-order-comments">
     <?php if ($block->canAddComment()):?>