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

Jump to bottom

fix: physical card status color AB#28503 #5375

Merged
merged 6 commits into from
Jun 10, 2024
Merged

fix: physical card status color AB#28503 #5375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dc59555
fix: use badge instead of chip AB#28503
arsforza Jun 4, 2024
ba64706
fix: rm old chip classes AB#28503
arsforza Jun 4, 2024
809ddd2
fix: add wrap to card number AB#28503
arsforza Jun 4, 2024
addfa4e
fix: tests AB#28503
arsforza Jun 4, 2024
b9b89b4
fix: correct typo AB#28503
arsforza Jun 10, 2024
4fb1b1e
fix: Remove some unused CSS
elwinschmitz Jun 10, 2024
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 e2e/pages/PhysicalCardOverview/PhysicalCardOverview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class PhysicalCardOverview {
this.debitCardPaTable = this.page.getByTestId(
'physical-cards-overview-title',
);
this.debitCardStatus = this.page.getByTestId('card-status-chip');
this.debitCardStatus = this.page.getByTestId('physical-card-status-badge');
}

async validateDebitCardStatus(cardOverviewTitle: string, status: string) {
Expand Down
19 changes: 8 additions & 11 deletions interfaces/Portal/src/app/components/physical-card-popup/physical-card-popup.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,14 @@
<ion-label class="card-key-value">
{{ 'registration-details.physical-cards-overview.status' | translate }}:
</ion-label>
<ion-label class="ion-text-end">
<ion-chip
class="physical-card-status-chip"
[ngClass]="
'physical-card-status-chip-' +
card?.status.replace(' ', '-').toLowerCase()
"
>
{{ card?.status }}
</ion-chip>
</ion-label>
<span
class="badge"
[ngClass]="
'physical-card-status-' + card?.status.replace(' ', '-').toLowerCase()
"
>
{{ card?.status }}
</span>
</ion-item>

<!-- Explanation -->
Expand Down
4 changes: 0 additions & 4 deletions interfaces/Portal/src/app/components/physical-card-popup/physical-card-popup.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
font-size: 14px !important;
}

ion-chip {
pointer-events: none;
}

.physical-card-explanation {
white-space: normal;
}
25 changes: 13 additions & 12 deletions ...ts/registration-physical-card-overview/registration-physical-card-overview.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,22 @@
[detail-icon]="'card'"
(click)="openCardDetails(card)"
>
<ion-label class="card">
<ion-label
class="physical-card-number util--half-margin-end"
[title]="card.tokenCode"
>
<code>{{ card.tokenCode }}</code>
</ion-label>
<ion-label
data-testid="card-status-chip"
class="ion-text-right"
><ion-chip
class="physical-card-status-chip"
[ngClass]="
'physical-card-status-chip-' +
card.status.replace(' ', '-').toLowerCase()
"
>{{ card.status }}</ion-chip
></ion-label
<span
data-testid="physical-card-status-badge"
class="badge"
[ngClass]="
'physical-card-status-' +
card.status.replace(' ', '-').toLowerCase()
"
>
{{ card.status }}
</span>
</ion-item>
</ion-list>
</ion-card-content>
Expand Down
6 changes: 4 additions & 2 deletions ...ts/registration-physical-card-overview/registration-physical-card-overview.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.card {
font-size: 14px;
.physical-card-number {
font-size: 0.875rem;
overflow: visible;
overflow-wrap: anywhere;
}
35 changes: 0 additions & 35 deletions interfaces/Portal/src/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,41 +271,6 @@ ion-button {
color: var(--ion-color-fiveten-red-700);
}

// for physical card list and popup in registration details page
.physical-card-status-chip {
pointer-events: none;
height: 20px;
&.physical-card-status-chip-active {
background-color: var(--ion-color-fiveten-success-100);
color: var(--ion-color-fiveten-success-700);
}
&.physical-card-status-chip-blocked {
background-color: var(--ion-color-fiveten-error-100);
color: var(--ion-color-fiveten-error-700);
}
&.physical-card-status-chip-issued {
background-color: var(--ion-color-fiveten-navy-100);
color: var(--ion-color-fiveten-link-700);
}
&.physical-card-status-chip-paused {
background-color: var(--ion-color-fiveten-warning-100);
color: var(--ion-color-fiveten-warning-700);
}
&.physical-card-status-chip-unknown {
background-color: var(--ion-color-fiveten-warning-100);
color: var(--ion-color-fiveten-warning-700);
}
&.physical-card-status-chip-suspected-fraud {
background-color: var(--ion-color-fiveten-error-100);
color: var(--ion-color-fiveten-error-700);
}
}
.chip {
pointer-events: none;
background-color: var(--ion-color-fiveten-neutral-100);
height: 27px;
}

ion-input.custom-border {
&.invalid-border {
--border-color: var(--ion-color-danger) !important;
Expand Down
25 changes: 25 additions & 0 deletions interfaces/Portal/src/styles/components/badge.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,28 @@
background-color: var(--ion-color-fiveten-red-100);
color: var(--ion-color-fiveten-red-700);
}

.badge.physical-card-status-active {
background-color: var(--ion-color-fiveten-green-100);
color: var(--ion-color-fiveten-green-700);
}
.badge.physical-card-status-blocked {
background-color: var(--ion-color-fiveten-red-100);
color: var(--ion-color-fiveten-red-700);
}
.badge.physical-card-status-issued {
background-color: var(--ion-color-fiveten-neutral-100);
color: var(--ion-color-fiveten-neutral-700);
}
.badge.physical-card-status-paused {
background-color: var(--ion-color-fiveten-yellow-100);
color: var(--ion-color-fiveten-yellow-700);
}
.badge.physical-card-status-unknown {
background-color: var(--ion-color-fiveten-yellow-100);
color: var(--ion-color-fiveten-yellow-700);
}
.badge.physical-card-status-suspected-fraud {
background-color: var(--ion-color-fiveten-red-100);
color: var(--ion-color-fiveten-red-700);
}
Loading