Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Pwa 3122 #4104

Merged
merged 8 commits into from
May 19, 2023
Merged

Pwa 3122 #4104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a7aafb4
PWA-3121::system is getting crashed with unexpected error when presse…
glo80771 Apr 24, 2023
1bf9c83
PWA-3121::Updated test cases
glo80771 Apr 24, 2023
c9e840b
PWA-3121::Formatted the code using prettier
glo80771 Apr 25, 2023
30bfee7
PWA-3122::System does not read displayed error message for accessibil…
glo80771 Apr 26, 2023
3c9e996
PWA-3122::Formatted the code using prettier
glo80771 Apr 26, 2023
d18ae43
Merge branch 'develop' into PWA-3122
glo82145 May 4, 2023
b815dee
Merge branch 'develop' into PWA-3122
glo82145 May 18, 2023
750f8d5
Merge branch 'develop' into PWA-3122
glo82145 May 19, 2023
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
22 changes: 22 additions & 0 deletions ...venia-ui/lib/components/CartPage/GiftCards/__tests__/__snapshots__/giftCards.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,17 @@ exports[`it renders correctly when it has cards 1`] = `
className="root"
/>
</div>
<span
aria-live="polite"
>
<div
className="balance"
>
<span
className="invalid_card_error"
/>
</div>
</span>
</div>
<div
className="root"
Expand Down Expand Up @@ -303,6 +314,17 @@ exports[`it renders correctly with no cards 1`] = `
className="root"
/>
</div>
<span
aria-live="polite"
>
<div
className="balance"
>
<span
className="invalid_card_error"
/>
</div>
</span>
</div>
<div
className="root"
Expand Down
40 changes: 23 additions & 17 deletions packages/venia-ui/lib/components/CartPage/GiftCards/giftCards.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,25 +133,31 @@ const GiftCards = props => {
);
}

const cardBalance = shouldDisplayCardBalance && (
<div className={classes.balance}>
<span className={classes.price}>
<FormattedMessage
id={'giftCards.balance'}
defaultMessage={'Balance: '}
/>
<Price
value={checkBalanceData.balance.value}
currencyCode={checkBalanceData.balance.currency}
/>
</span>
</div>
);

const containerClass = shouldDisplayCardError
? classes.card_input_container_error
: classes.card_input_container;

const cardBalance = (
<div className={classes.balance}>
{checkBalanceData && shouldDisplayCardBalance ? (
<div className={classes.price}>
<FormattedMessage
id={'giftCards.balance'}
defaultMessage={'Balance: '}
/>
<Price
value={checkBalanceData.balance.value}
currencyCode={checkBalanceData.balance.currency}
/>
</div>
) : (
<span className={classes.invalid_card_error}>
{cardEntryErrorMessage}
</span>
)}
</div>
);

const cardEntryContents = (
<div className={classes.card}>
<Field
Expand All @@ -172,15 +178,15 @@ const GiftCards = props => {
field="card"
mask={value => value && value.trim()}
maskOnBlur={true}
message={cardEntryErrorMessage}
// message={cardEntryErrorMessage}
placeholder={formatMessage({
id: 'giftCards.cardEntry',
defaultMessage: 'Enter card number'
})}
validate={isRequired}
/>
</div>
{cardBalance}
<span aria-live="polite">{cardBalance}</span>
</Field>
<Field
classes={{
Expand Down
4 changes: 4 additions & 0 deletions packages/venia-ui/lib/components/CartPage/GiftCards/giftCards.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@
.card_input_container {
}

.invalid_card_error {
color: red;
}

/* TODO @TW: cannot compose */
.card_input_container_error input {
/* composes: border-error from global; */
Expand Down