convert use submit and verify process

Author: ripplefox

js/controller/convert.js

@@ -44,7 +44,8 @@ myApp.controller("ConvertCtrl", ['$scope', '$rootScope', 'XrpApi', 'XrpPath', 'S
       $scope.found = false;
       $scope.asset = {};
       $scope.finding = true;
-      $scope.send_done = false;
+      $scope.hash = "";
+      $scope.tx_state = "";
       $scope.send_error = '';
       $scope.lastUpdate = 0;
 
@@ -94,13 +95,26 @@ myApp.controller("ConvertCtrl", ['$scope', '$rootScope', 'XrpApi', 'XrpPath', 'S
     }
 
     $scope.sending;
-    $scope.send_done = false;
     $scope.send_error = '';
+    
+    $scope.hash = "";
+    $scope.tx_state = "";
+    $scope.$on("txSuccess", function(e, tx) {
+      console.debug('txSuccess event', tx);
+      if (tx.hash == $scope.hash) $scope.tx_state = "success";
+      $scope.$apply();
+    });
+    $scope.$on("txFail", function(e, tx) {
+      console.debug('txFail event', tx);
+      if (tx.hash == $scope.hash) $scope.tx_state = "fail";
+      $scope.$apply();
+    });
 
     $scope.convert_confirmed = function() {
       $scope.mode = 'submit';
       $scope.sending = true;
-      $scope.send_done = false;
+      $scope.hash = "";
+      $scope.tx_state = "";
       $scope.send_error = '';
 
       var alt = $scope.asset.origin;
@@ -129,9 +143,10 @@ myApp.controller("ConvertCtrl", ['$scope', '$rootScope', 'XrpApi', 'XrpPath', 'S
             value : $scope.dst_amount.toString()
         }
       }
-      XrpApi.convert(srcAmount, dstAmount, alt.paths_computed).then(result => {
+      XrpApi.convert(srcAmount, dstAmount, alt.paths_computed).then(hash => {
         $scope.sending = false;
-        $scope.send_done = true;
+        $scope.hash = hash;
+        $scope.tx_state = "submitted";
         $rootScope.$apply();
       }).catch(err => {
         $scope.sending = false;

js/ripple/api.factory.js

@@ -89,13 +89,10 @@ myApp.factory('XrpApi', ['$rootScope', 'AuthenticationFactory', 'ServerManager',
           maxLedgerVersion: maxLedger
         };
         _remote.getTransaction(hash, options).then(data => {
-          console.log(data);
-          console.log('Final Result: ', data.outcome.result);
-          console.log('Validated in Ledger: ', data.outcome.ledgerVersion);
-          console.log('Sequence: ', data.sequence);
           if (data.outcome.result === 'tesSUCCESS') {
             $rootScope.$broadcast('txSuccess', { hash: hash, options: options});
           } else {
+            console.error(data);
             $rootScope.$broadcast('txFail', { hash: hash});
           }
         }).catch(err => {

pages/convert.html

@@ -85,11 +85,14 @@
 							<i class="fa fa-spinner fa-pulse"></i> {{ 'submitting' | translate}}
 					  </div>
 			  </div>
-			  <div class="row form-group block" ng-show="send_done">
-						<div class="message">
-							<h2 class="result-success" translate="submitted">Your transaction has been submitted.</h2>
+			  <div class="row form-group block" ng-show="tx_state">
+						<div class="message" ng-show="tx_state == 'submitted'">
+							<h2 translate="submitted">Your transaction has been submitted.</h2>
 					  	<p translate="act_will_upd">Your account will update once the transaction has cleared.</p>
 					  </div>
+					  <div class="message" ng-show="tx_state == 'success'">
+							<h2 class="result-success" translate="cleared">Transaction cleared!</h2>
+					  </div>
 					<hr>
 			  	<div class="actionLink"><a href="" ng-click="init()" translate="back_convert">Do another conversion</a></div>
 			  	<div class="actionLink"><a href="" ng-click="goTo('balance')" translate="go_balance">Back to balance</a></div>