@@ -7,13 +7,13 @@ import { useCartContext } from '../../context/cart';
7
7
import { useUserContext } from '../../context/user' ;
8
8
import { useAwaitQuery } from '../../hooks/useAwaitQuery' ;
9
9
import { retrieveCartId } from '../../store/actions/cart' ;
10
- import { useDropdown } from '@magento/peregrine/lib/hooks/useDropdown' ;
11
10
12
11
import DEFAULT_OPERATIONS from './signIn.gql' ;
13
12
import { useEventingContext } from '../../context/eventing' ;
14
13
15
14
export const useSignIn = props => {
16
15
const {
16
+ handleTriggerClick,
17
17
getCartDetailsQuery,
18
18
setDefaultUsername,
19
19
showCreateAccount,
@@ -64,18 +64,11 @@ export const useSignIn = props => {
64
64
const formApiRef = useRef ( null ) ;
65
65
const setFormApi = useCallback ( api => ( formApiRef . current = api ) , [ ] ) ;
66
66
67
- const { setExpanded : setCurrencyMenuIsOpen } = useDropdown ( ) ;
68
-
69
- const handleTrigger = useCallback ( ( ) => {
70
- // Toggle Stores Menu.
71
- setCurrencyMenuIsOpen ( isOpen => ! isOpen ) ;
72
- } , [ setCurrencyMenuIsOpen ] ) ;
73
-
74
67
const handleSubmit = useCallback (
75
68
async ( { email, password } ) => {
76
69
setIsSigningIn ( true ) ;
77
70
handleTrigger ( ) ;
78
-
71
+
79
72
try {
80
73
// Get source cart id (guest cart id).
81
74
const sourceCartId = cartId ;
@@ -106,15 +99,13 @@ export const useSignIn = props => {
106
99
} ) ;
107
100
const destinationCartId = await retrieveCartId ( ) ;
108
101
109
- if ( destinationCartId != sourceCartId ) {
110
- // Merge the guest cart into the customer cart.
111
- await mergeCarts ( {
112
- variables : {
113
- destinationCartId,
114
- sourceCartId
115
- }
116
- } ) ;
117
- }
102
+ // Merge the guest cart into the customer cart.
103
+ await mergeCarts ( {
104
+ variables : {
105
+ destinationCartId,
106
+ sourceCartId
107
+ }
108
+ } ) ;
118
109
119
110
// Ensure old stores are updated with any new data.
120
111
@@ -155,7 +146,7 @@ export const useSignIn = props => {
155
146
getCartDetails ,
156
147
fetchCartDetails ,
157
148
dispatch ,
158
- handleTrigger
149
+ handleTriggerClick
159
150
]
160
151
) ;
161
152
0 commit comments