ENGCOM-4812: Fix #20111 - display variables in popup while editing existing email template #22469

 - Merge Pull Request #22469 from Bartlomiejsz/magento2:feature/fix_20111_email_template_variables
 - Merged commits:
   1. 7d584ac

Author: magento-engcom-team

app/code/Magento/Email/Model/Template.php

@@ -326,7 +326,7 @@ public function getVariablesOptionArray($withGroup = false)
                 $optionArray[] = ['value' => '{{' . $value . '}}', 'label' => __('%1', $label)];
             }
             if ($withGroup) {
-                $optionArray = ['label' => __('Template Variables'), 'value' => $optionArray];
+                $optionArray = [['label' => __('Template Variables'), 'value' => $optionArray]];
             }
         }
         return $optionArray;

app/code/Magento/Email/Test/Unit/Model/TemplateTest.php

@@ -598,16 +598,18 @@ public function getVariablesOptionArrayDataProvider()
                     'label' => __('Template Variables'),
                     'value' => [
                         [
-                            'value' => '{{store url=""}}',
-                            'label' => __('%1', 'Store Url'),
-                        ],
-                        [
-                            'value' => '{{var logo_url}}',
-                            'label' => __('%1', 'Email Logo Image Url'),
-                        ],
-                        [
-                            'value' => '{{var customer.name}}',
-                            'label' => __('%1', 'Customer Name'),
+                            [
+                                'value' => '{{store url=""}}',
+                                'label' => __('%1', 'Store Url'),
+                            ],
+                            [
+                                'value' => '{{var logo_url}}',
+                                'label' => __('%1', 'Email Logo Image Url'),
+                            ],
+                            [
+                                'value' => '{{var customer.name}}',
+                                'label' => __('%1', 'Customer Name'),
+                            ],
                         ],
                     ],
                 ],