Inaccurate Delivery Notifications.

Describe the bug
Even if a rider has not been assigned to the order, the customer receives a notification stating that their order has been delivered. This creates confusion and frustration for the customer as they may expect their food to arrive when it hasn't
To Reproduce

Place an order customer app
Mark the order as delivered.
Observe the incorrect status update and unnecessary notification sent to the customer.
Expected behavior
If a rider has not been assigned to the order, the customer should not receive any notification indicating that their order has been delivered. The notification should only be sent once the rider is assigned and the food is on its way to the customer.

Screenshots

Untitled.video.-.Made.with.Clipchamp.3.mp4
Smartphone:

Device: IOS & Android.

No source files or tests are named. Reproduce the order flow in the customer app, then trace where rider assignment and delivery-status notifications are handled; done means no delivery notification is sent before the rider is assigned and the food is on its way.

Written by the indexing model from the issue text.