From 402f39257d14410dbc06b5f2e152db3f7211b4ff Mon Sep 17 00:00:00 2001
From: aleksandrskondratjevs <aleksandrs.kondratjevs_1@outlook.com>
Date: Mon, 17 Oct 2022 11:11:01 +0300
Subject: [PATCH] Fixed some issue before release

---
 .../MyAccountAddressForm/MyAccountAddressForm.form.ts          | 2 +-
 .../component/MyAccountSignIn/MyAccountSignIn.container.tsx    | 3 +--
 packages/scandipwa/src/component/Router/Router.component.tsx   | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/scandipwa/src/component/MyAccountAddressForm/MyAccountAddressForm.form.ts b/packages/scandipwa/src/component/MyAccountAddressForm/MyAccountAddressForm.form.ts
index ded0a36994..23ef6cdfb9 100644
--- a/packages/scandipwa/src/component/MyAccountAddressForm/MyAccountAddressForm.form.ts
+++ b/packages/scandipwa/src/component/MyAccountAddressForm/MyAccountAddressForm.form.ts
@@ -263,7 +263,7 @@ export const myAccountAddressForm = (
                     attr: {
                         id: 'address-country-id',
                         name: 'country_id',
-                        defaultValue: countryId,
+                        value: countryId,
                         selectPlaceholder: __('Select country...'),
                     },
                     events: {
diff --git a/packages/scandipwa/src/component/MyAccountSignIn/MyAccountSignIn.container.tsx b/packages/scandipwa/src/component/MyAccountSignIn/MyAccountSignIn.container.tsx
index 01e0b4f61d..46ef30f2c7 100644
--- a/packages/scandipwa/src/component/MyAccountSignIn/MyAccountSignIn.container.tsx
+++ b/packages/scandipwa/src/component/MyAccountSignIn/MyAccountSignIn.container.tsx
@@ -13,7 +13,6 @@ import { PureComponent } from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 
-import { MyAccountPageState } from 'Component/MyAccountOverlay/MyAccountOverlay.config';
 import { SignInOptions } from 'Query/MyAccount.type';
 import { CheckoutStepUrl } from 'Route/Checkout/Checkout.config';
 import { showNotification } from 'Store/Notification/Notification.action';
@@ -84,7 +83,7 @@ MyAccountSignInContainerState
         const { isEmailAvailable: prevIsEmailAvailable } = prevProps;
 
         if (isCheckout && isEmailAvailable && !prevIsEmailAvailable) {
-            setSignInState(MyAccountPageState.STATE_SIGN_IN);
+            setSignInState('');
         }
     }
 
diff --git a/packages/scandipwa/src/component/Router/Router.component.tsx b/packages/scandipwa/src/component/Router/Router.component.tsx
index 24079c545b..9cb205582c 100644
--- a/packages/scandipwa/src/component/Router/Router.component.tsx
+++ b/packages/scandipwa/src/component/Router/Router.component.tsx
@@ -178,7 +178,7 @@ export class RouterComponent extends PureComponent<RouterComponentProps, RouterC
             name: RouterSwitchItemType.CONFIRM_ACCOUNT,
         },
         {
-            component: <Route path={ withStoreRegex('/sales/order/view/order_id/:orderId?') } render={ ({ match }) => <MyAccount match={ match } selectedTab={ MyAccountTabs.MY_ORDER } /> } />,
+            component: <Route path={ withStoreRegex('/sales/order/view/order_id/:orderId?') } render={ ({ match }) => <MyAccount match={ match } selectedTab={ MyAccountTabs.MY_ORDERS } /> } />,
             position: 70,
             name: RouterSwitchItemType.MY_ACCOUNT_ORDER,
         },