From d860f3efa975c2af061635849701ac43f5a665f4 Mon Sep 17 00:00:00 2001
From: Siarhei_Dzeraviannik <siarhei_dzeraviannik@epam.com>
Date: Fri, 18 Oct 2024 17:24:20 +0300
Subject: [PATCH 1/4] [Modals]: fixed value for default modal width

---
 changelog.md          | 1 +
 uui/settings.ts       | 2 +-
 uui/settings.types.ts | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index 4f725ddedf..60d6099290 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,7 @@
 
 **What's Fixed**
 * [Text]: fixed bug when passed rawProps override Text internal styles
+* [Modals]: fixed value for default modal width
 
 # 5.10.1 - 16.10.2024
 
diff --git a/uui/settings.ts b/uui/settings.ts
index 9169ab22a7..40f8d96366 100644
--- a/uui/settings.ts
+++ b/uui/settings.ts
@@ -267,7 +267,7 @@ export const settings: Settings = {
         modal: {
             window: {
                 defaults: {
-                    width: '420',
+                    width: 420,
                 },
             },
         },
diff --git a/uui/settings.types.ts b/uui/settings.types.ts
index 97502a6306..da7941bd82 100644
--- a/uui/settings.types.ts
+++ b/uui/settings.types.ts
@@ -221,7 +221,7 @@ interface TabButtonSizes {
 }
 
 interface ModalWindowDefaultSizes {
-    width: string;
+    width: number;
 }
 
 interface ModalWindowSizes {

From 0043be200f81d456d540944d30774f5175a104b5 Mon Sep 17 00:00:00 2001
From: Siarhei_Dzeraviannik <siarhei_dzeraviannik@epam.com>
Date: Fri, 18 Oct 2024 18:13:42 +0300
Subject: [PATCH 2/4] update snapshot

---
 .../overlays/__tests__/__snapshots__/Modals.test.tsx.snap       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uui/components/overlays/__tests__/__snapshots__/Modals.test.tsx.snap b/uui/components/overlays/__tests__/__snapshots__/Modals.test.tsx.snap
index 1ed820157e..0274d640d2 100644
--- a/uui/components/overlays/__tests__/__snapshots__/Modals.test.tsx.snap
+++ b/uui/components/overlays/__tests__/__snapshots__/Modals.test.tsx.snap
@@ -114,7 +114,7 @@ exports[`Modals should be rendered correctly with minimum props 1`] = `
       Object {
         "height": "auto",
         "maxHeight": "80dvh",
-        "width": "420",
+        "width": 420,
       }
     }
   >

From 92ea7f0b5f39ea649e595eadf97a7a66b4f00a5c Mon Sep 17 00:00:00 2001
From: Dzmitry Drozd <Dzmitry_Drozd@epam.com>
Date: Fri, 18 Oct 2024 16:03:32 +0300
Subject: [PATCH 3/4] 3238 Update increment strategy for prod branch

---
 GitVersion.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GitVersion.yml b/GitVersion.yml
index 9083c7bc77..c062849c84 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -8,7 +8,7 @@ branches:
     regex: ^main$
     mode: ContinuousDelivery
     tag: ''
-    increment: Minor
+    increment: Patch
     prevent-increment-of-merged-branch-version: false
     track-merge-target: true
     is-release-branch: true

From a1d716bb968e72316d51d2845a352e1a6a3c3942 Mon Sep 17 00:00:00 2001
From: AlekseyManetov <aliaksei_manetau@epam.com>
Date: Mon, 21 Oct 2024 16:06:03 +0200
Subject: [PATCH 4/4] add keys for main menu items

---
 app/src/common/AppHeader.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/common/AppHeader.tsx b/app/src/common/AppHeader.tsx
index faac142716..4bf7feb661 100644
--- a/app/src/common/AppHeader.tsx
+++ b/app/src/common/AppHeader.tsx
@@ -105,7 +105,7 @@ export function AppHeader() {
 
     const renderDirectionSwitcher = () => {
         return (
-            <FlexRow padding="12">
+            <FlexRow padding="12" key="RTL-switcher">
                 <MultiSwitch value={ direction } onValueChange={ changeContentDirection } items={ [{ id: 'ltr', caption: 'LTR' }, { id: 'rtl', caption: 'RTL' }] } />
             </FlexRow>
         );
@@ -233,13 +233,14 @@ export function AppHeader() {
                                 <DropdownMenuButton caption="EPAM Team (employee only)" href="https://www.figma.com/design/M5Njgc6SQJ3TPUccp5XHQx/UUI-Components?m=auto&t=qiBDEE9slwMV4paI-6" target="_blank" />
                             </DropdownMenuBody>
                         ) }
+                        key="figma-source"
                     />
                 ),
             },
             {
                 id: 'git',
                 priority: 4,
-                render: () => <MainMenuButton icon={ GitIcon } href={ GIT_LINK } target="_blank" cx={ cx(css.icon) } />,
+                render: () => <MainMenuButton icon={ GitIcon } href={ GIT_LINK } target="_blank" cx={ cx(css.icon) } key="github-link" />,
             },
             {
                 id: 'gitStar',