Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

# / Out Toggle on Cart & Checkout Pages #2258

Merged
merged 8 commits into from
Mar 19, 2020
Merged

# / Out Toggle on Cart & Checkout Pages #2258

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ba8b158
Slight # refactor
supernova-at Mar 17, 2020
3aaa0e0
Adds sign out functionality to checkout page
supernova-at Mar 17, 2020
c42cd98
Implements # Toggle on Cart Page
supernova-at Mar 17, 2020
c189a17
Rips out sign out functionality
supernova-at Mar 18, 2020
112b0f3
Consistency with cart page
supernova-at Mar 18, 2020
1c0416b
Merge branch 'develop' into supernova/243_sign_in
supernova-at Mar 18, 2020
b6d2819
Merge branch 'develop' into supernova/243_sign_in
tjwiebell Mar 19, 2020
879f3a3
Merge branch 'develop' into supernova/243_sign_in
tjwiebell Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/peregrine/lib/talons/AuthModal/useAuthModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const useAuthModal = props => {
await resetStore();
await signOut({ revokeToken });

// Go back to first page of browser history (refresh).
// Refresh this page.
history.go(0);
}, [history, resetStore, revokeToken, signOut]);

Expand Down
2 changes: 1 addition & 1 deletion packages/peregrine/lib/talons/CheckoutPage/useCheckoutPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const useCheckoutPage = props => {
* Using local state to maintain these booleans. Can be
* moved to checkout context in the future if needed.
*
* These are needed to track progree of checkout steps.
* These are needed to track progress of checkout steps.
*/
const [shippingInformationDone, updateShippingInformationDone] = useState(
false
Expand Down
6 changes: 3 additions & 3 deletions packages/venia-ui/lib/components/CheckoutPage/checkoutPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ const CheckoutPage = props => {

const classes = mergeClasses(defaultClasses, propClasses);

const guestCheckout = isGuestCheckout ? (
const signInDisplay = isGuestCheckout ? (
<div className={classes.signin_container}>
<Button
className={classes.sign_in}
onClick={handleSignIn}
priority="high"
>
{'Login and Checkout Faster'}
{'# and Checkout Faster'}
</Button>
</div>
) : null;
Expand Down Expand Up @@ -121,7 +121,7 @@ const CheckoutPage = props => {

const checkoutSteps = !isCartEmpty ? (
<Fragment>
{guestCheckout}
{signInDisplay}
<div className={classes.heading_container}>
<h1 className={classes.heading}>
{isGuestCheckout
Expand Down