funcodingdev
diff --git a/‎api/pkg/repositories/gorm_message_repository.go‎
Lines changed: 3 additions & 2 deletions b/‎api/pkg/repositories/gorm_message_repository.go‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎web/pages/threads/_id.vue‎
Lines changed: 22 additions & 4 deletions b/‎web/pages/threads/_id.vue‎
Lines changed: 22 additions & 4 deletions
@@ -116,8 +116,9 @@ func (repository *gormMessageRepository) GetOutstanding(ctx context.Context, own
 					tx.Model(&entities.Message{}).
 						Where("owner = ?", owner).
 						Where(
-							repository.db.Where("status = ?", entities.MessageStatusPending).
-								Or("status = ? AND age(now(), last_attempted_at) >  ?", entities.MessageStatusSending, "15 minutes"),
+							repository.db.
+								Where("status = ?", entities.MessageStatusPending).
+								Where("age(now(), created_at) < ?", "5 minutes"),
 						).
 						Order("request_received_at ASC").
 						Select("id").
 
@@ -101,21 +101,32 @@
                   <v-tooltip bottom>
                     <template #activator="{ on, attrs }">
                       <div v-bind="attrs" v-on="on">
+                        <v-icon
+                          v-if="isExpired(message)"
+                          color="primary"
+                          class="mt-n6"
+                          >mdi-alert</v-icon
+                        >
                         <v-progress-circular
-                          v-if="isPending(message)"
+                          v-else-if="isPending(message)"
                           indeterminate
                           :size="14"
                           :width="1"
                           class="mt-n2"
-                          color="primary"
+                          :color="
+                            message.status === 'pending' ? 'primary' : 'warning'
+                          "
                         ></v-progress-circular>
                         <v-icon
-                          v-if="message.status === 'delivered'"
+                          v-else-if="message.status === 'delivered'"
                           color="primary"
                           class="mt-n6"
                           >mdi-check-all</v-icon
                         >
-                        <v-icon v-if="message.status === 'sent'" class="mt-n6">
+                        <v-icon
+                          v-else-if="message.status === 'sent'"
+                          class="mt-n6"
+                        >
                           mdi-check
                         </v-icon>
                       </div>
@@ -219,6 +230,13 @@ export default Vue.extend({
       return ['sending', 'pending'].includes(message.status)
     },
 
+    isExpired(message: Message): boolean {
+      return (
+        new Date().getTime() - new Date(message.created_at).getTime() >
+        5 * 60 * 1000
+      ) // 5 minutes
+    },
+
     isMT(message: Message): boolean {
       return message.type === 'mobile-terminated'
     },