Merge pull request scandipwa#5231 from AleksandrsKondratjevs/ts-issue…

…-some-prerelase-fixes TypeScript-issue - Fixed some issue before release
denisprotassoff · Oct 17, 2022 · b361a5d · b361a5d
2 parents bffc36a + 402f392
commit b361a5d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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,
         },