PWA-3230::merged code for pwa-3214

git add packages/peregrine/lib/talons/SignIn/useSignIn.js

packages/peregrine/lib/talons/SignIn/useSignIn.js

@@ -9,13 +9,11 @@ import { useAwaitQuery } from '../../hooks/useAwaitQuery';
 import { retrieveCartId } from '../../store/actions/cart';
 import { useDropdown } from '@magento/peregrine/lib/hooks/useDropdown';
 
-
 import DEFAULT_OPERATIONS from './signIn.gql';
 import { useEventingContext } from '../../context/eventing';
 
 export const useSignIn = props => {
     const {
-        handleTriggerClick,
         getCartDetailsQuery,
         setDefaultUsername,
         showCreateAccount,
@@ -66,13 +64,7 @@ export const useSignIn = props => {
     const formApiRef = useRef(null);
     const setFormApi = useCallback(api => (formApiRef.current = api), []);
 
-
-    const {
-        elementRef: currencyMenuRef,
-        expanded: currencyMenuIsOpen,
-        setExpanded: setCurrencyMenuIsOpen,
-        triggerRef: currencyMenuTriggerRef
-    } = useDropdown();
+    const { setExpanded: setCurrencyMenuIsOpen } = useDropdown();
 
     const handleTrigger = useCallback(() => {
         // Toggle Stores Menu.
@@ -113,13 +105,15 @@ export const useSignIn = props => {
                 });
                 const destinationCartId = await retrieveCartId();
 
-                // Merge the guest cart into the customer cart.
-                await mergeCarts({
-                    variables: {
-                        destinationCartId,
-                        sourceCartId
-                    }
-                });
+                if (destinationCartId != sourceCartId) {
+                    // Merge the guest cart into the customer cart.
+                    await mergeCarts({
+                        variables: {
+                            destinationCartId,
+                            sourceCartId
+                        }
+                    });
+                }
 
                 // Ensure old stores are updated with any new data.
 
@@ -160,7 +154,7 @@ export const useSignIn = props => {
             getCartDetails,
             fetchCartDetails,
             dispatch,
-            handleTriggerClick
+            handleTrigger
         ]
     );