diff --git a/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/order_driver.jsp b/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/order_driver.jsp
index c19f2ec977e68b695ae3f449042364e4986cc803..0d4b662489b7e3f92d9e7251849281440afed0d5 100644
--- a/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/order_driver.jsp
+++ b/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/order_driver.jsp
@@ -3,7 +3,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
-<div ng-app= "chatApp" class="container">
+<div ng-app= "orderApp" class="container">
     <div class="wrapper row">
         <div>
             <div class="page-title row txt-center height-fit float-container">
@@ -12,13 +12,13 @@
                 </div>
             </div>
         </div>
-        <div class="order-form" ng-controller="controlShow">
+        <div class="order-form" ng-controller="OrderController">
             <div class="txt-center">
                 <h2 ng-show="textFind" class="inline-block">Finding Order....</h2>
             </div>
             <div class="txt-center">
-                <button class="form-input find-button" ng-hide="buttonFind" ng-click="hideFind()">FIND ORDER</button>
-                <button class="close-button-order" ng-show="buttonClose" ng-click="hideClose()">CLOSE</button>
+                <button class="form-input find-button" ng-hide="buttonFind" ng-click="activateFind()">FIND ORDER</button>
+                <button class="close-button-order" ng-show="buttonClose" ng-click="activateClose()">CLOSE</button>
             </div>
         </div>
     </div>
@@ -26,25 +26,37 @@
 
 <%@include file="/component/footer.html" %>
 
+<script src="js/converse.js"></script>
 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"></script>
 <script>
     window.onload = toggleActive("nav-order")
 </script>
 <script>
-    var chatApp = angular.module('chatApp', [])
-        .controller('controlShow', function($scope) {
-            $scope.hideFind = function() {
+    angular.module('orderApp', [])
+        .service('ConverseService', converse)
+        .controller('OrderController', function ($scope, $q, ConverseService) {
+            let account = new ConverseService.Driver(2)
+
+            let canceller
+
+            $scope.activateFind = function() {
                 $scope.textFind = true;
                 $scope.buttonClose = true;
                 $scope.buttonFind = true;
-            };
 
-            $scope.hideClose = function() {
+                canceller = $q.defer()
+
+                account.waitAsync(canceller)
+            }
+
+            $scope.activateClose = function() {
                 $scope.textFind = false;
                 $scope.buttonFind = false;
                 $scope.buttonClose = false;
 
-            };
-
-    });
+                if (canceller) {
+                    canceller.resolve()
+                }
+            }
+        })
 </script>
diff --git a/TugasBesar2_2017/WebApp/src/main/webapp/js/converse.js b/TugasBesar2_2017/WebApp/src/main/webapp/js/converse.js
index 71a6279538cd63867733cfeae032481ad60b836d..9a7dab5d49dc5c2b128f50b0d6985cf5aa10af9e 100644
--- a/TugasBesar2_2017/WebApp/src/main/webapp/js/converse.js
+++ b/TugasBesar2_2017/WebApp/src/main/webapp/js/converse.js
@@ -1,4 +1,3 @@
-
 let converse = function ($http) {
   let apiUrl = 'http://localhost:8081'
 
@@ -59,7 +58,7 @@ let converse = function ($http) {
   }
 
   class Driver extends Account {
-    async waitAsync (locations, timeout) {
+    async waitAsync (timeout) {
       let response = await $http.post(`${apiUrl}/driver/${this.id}/wait`, null, {
         timeout: timeout
       })