diff --git a/src/app/features/home/transaction/transaction-details/transaction-details.page.scss b/src/app/features/home/transaction/transaction-details/transaction-details.page.scss index 40b1a1188..0443437e5 100644 --- a/src/app/features/home/transaction/transaction-details/transaction-details.page.scss +++ b/src/app/features/home/transaction/transaction-details/transaction-details.page.scss @@ -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 { diff --git a/src/app/features/home/transaction/transaction-details/transaction-details.page.ts b/src/app/features/home/transaction/transaction-details/transaction-details.page.ts index b0eaa7072..7e5350858 100644 --- a/src/app/features/home/transaction/transaction-details/transaction-details.page.ts +++ b/src/app/features/home/transaction/transaction-details/transaction-details.page.ts @@ -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) { @@ -59,6 +62,7 @@ enum Status { waitingToBeAccepted = 'waitingToBeAccepted', InProgress = 'inProgress', Returned = 'returned', + Missed = 'missed', Delivered = 'delivered', Accepted = 'accepted', } diff --git a/src/app/features/home/transaction/transaction.page.scss b/src/app/features/home/transaction/transaction.page.scss index 9286331e9..96b7244ed 100644 --- a/src/app/features/home/transaction/transaction.page.scss +++ b/src/app/features/home/transaction/transaction.page.scss @@ -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; + } } } diff --git a/src/assets/i18n/en-us.json b/src/assets/i18n/en-us.json index a9e60630d..b49bcd39c 100644 --- a/src/assets/i18n/en-us.json +++ b/src/assets/i18n/en-us.json @@ -142,6 +142,7 @@ "accepted": "Accepted", "delivered": "Delivered", "returned": "Returned", + "missed": "Returned", "inProgress": "In Progress", "waitingToBeAccepted": "In Progress", "null": "Not Provided" diff --git a/src/assets/i18n/zh-tw.json b/src/assets/i18n/zh-tw.json index 9107fa101..7a5faea9b 100644 --- a/src/assets/i18n/zh-tw.json +++ b/src/assets/i18n/zh-tw.json @@ -141,6 +141,7 @@ "accepted": "已接收", "delivered": "已送出", "returned": "已退回", + "missed": "已退回", "inProgress": "等待中", "waitingToBeAccepted": "等待中", "null": "未提供"