Skip to content

Display stroked status style if the asset is not owned by the user. #526

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

Merged
merged 1 commit into from
Feb 3, 2021
Merged

Display stroked status style if the asset is not owned by the user. #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/app/features/home/transaction/transaction-details/transaction-details.page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,14 @@ mat-toolbar {

button.returned {
color: white;
border-color: var(--ion-color-danger);
border-color: #e31587;
background-color: #e31587;
}

button.missed {
color: #e31587;
border-color: #e31587;
}
}

.column {
Expand Down
6 changes: 5 additions & 1 deletion src/app/features/home/transaction/transaction-details/transaction-details.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ export async function getStatus(
) {
const resolvedEmail = await email;
if (transaction.expired) {
return Status.Returned;
if (transaction.sender === resolvedEmail) {
return Status.Returned;
}
return Status.Missed;
}
if (!transaction.fulfilled_at) {
if (transaction.receiver_email === resolvedEmail) {
Expand All @@ -59,6 +62,7 @@ enum Status {
waitingToBeAccepted = 'waitingToBeAccepted',
InProgress = 'inProgress',
Returned = 'returned',
Missed = 'missed',
Delivered = 'delivered',
Accepted = 'accepted',
}
7 changes: 6 additions & 1 deletion src/app/features/home/transaction/transaction.page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,13 @@ mat-toolbar {

button.returned {
color: white;
border-color: var(--ion-color-danger);
border-color: #e31587;
background-color: #e31587;
}

button.missed {
color: #e31587;
border-color: #e31587;
}
}
}
1 change: 1 addition & 0 deletions src/assets/i18n/en-us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
"accepted": "Accepted",
"delivered": "Delivered",
"returned": "Returned",
"missed": "Returned",
"inProgress": "In Progress",
"waitingToBeAccepted": "In Progress",
"null": "Not Provided"
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/zh-tw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
"accepted": "已接收",
"delivered": "已送出",
"returned": "已退回",
"missed": "已退回",
"inProgress": "等待中",
"waitingToBeAccepted": "等待中",
"null": "未提供"
Expand Down