send_later: Cancel scheduling from popover.

web/src/popover_menus.js

@@ -930,16 +930,16 @@ export function initialize() {
                                 e.stopPropagation();
                             },
                         );
-
-                        $send_later_modal.one("click", "#clear_compose_schedule_state", (e) => {
-                            overlays.close_active_modal();
-                            compose.reset_compose_scheduling_state(false);
-                            e.preventDefault();
-                            e.stopPropagation();
-                        });
                     },
                 });
             });
+            $popper.one("click", "#clear_compose_schedule_state", (e) => {
+                compose.reset_compose_scheduling_state(false);
+                // Close the popper instance when clearing scheduling:
+                instance.hide();
+                e.preventDefault();
+                e.stopPropagation();
+            });
         },
         onHidden(instance) {
             instance.destroy();

web/templates/send_later_modal.hbs

@@ -14,11 +14,6 @@
                 </div>
                 <div class="send_later_options">
                     <ul class="nav nav-list">
-                        {{#if formatted_send_later_time }}
-                        <li>
-                            <a id="clear_compose_schedule_state" tabindex="0">{{t "Now" }}</a>
-                        </li>
-                        {{/if}}
                         {{#if possible_send_later_today}}
                             {{#each possible_send_later_today}}
                                 <li>

web/templates/send_later_popover.hbs

@@ -2,6 +2,11 @@
     <li>
         <a class="open_send_later_modal" tabindex="0">{{t "Schedule message" }}</a>
     </li>
+    {{#if formatted_send_later_time }}
+    <li>
+        <a id="clear_compose_schedule_state" tabindex="0">{{t "Cancel scheduling" }}</a>
+    </li>
+    {{/if}}
     <hr />
     <li>
         <a href="#scheduled" tabindex="0">{{t "View scheduled messages" }}</a>