Merge pull request byteball#268 from kakysha/master

erase textcoin

Author: tonyofbyteball

public/views/modals/tx-details.html

@@ -119,13 +119,13 @@ <h4 class="title m0" translate>Details</h4>
     </span>
     </li>
 
-    <li ng-if="btx.textcoin" class="line-b p10 oh">
+    <li ng-if="btx.isTextcoin" class="line-b p10 oh">
 	    <span class="text-gray" translate>Was claimed?</span>
 	    <span class="right" >
 	      <span class="text-warning" ng-show="!btx.claimed" translate>
 	        not claimed
 	   	</span>
-	      <span ng-show="!btx.claimed" class="external-link">
+	      <span ng-show="!btx.claimed && btx.mnemonic" class="external-link">
 	      	(<a href="#" ng-click="$root.$emit('claimTextcoin', btx.mnemonic.split('-').join(' '));" style="padding: 0; color: inherit;">claim back</a>)
 	      </span>
 	      <span class="label gray radius" ng-show="btx.claimed" translate>
@@ -135,14 +135,17 @@ <h4 class="title m0" translate>Details</h4>
 	    </span>
     </li>
 
-    <li ng-if="btx.textcoin && !btx.claimed" class="line-b p10 oh">
-		If the recipient doesn't see your payment, you can <a class="blue-link" style="padding: 0" ng-click="shareAgain()" translate>share again</a>
+    <li ng-if="btx.isTextcoin && !btx.claimed && btx.mnemonic" class="line-b p10 oh">
+		<span translate>If the recipient doesn't see your payment, you can</span> <a class="blue-link" style="padding: 0" ng-click="shareAgain()" translate>share again</a>
+    </li>
+    <li ng-if="btx.isTextcoin && !btx.claimed && btx.mnemonic" class="line-b p10 oh">
+		<span translate>You can erase textcoin from your wallet</span> <a class="blue-link" style="padding: 0" ng-click="eraseTextcoin()" translate>erase textcoin</a>
     </li>
     <li ng-if="btx.action == 'sent' && isPrivate" class="line-b p10 oh">
-		If the recipient doesn't see your payment, you can <a class="blue-link" style="padding: 0" ng-click="showCorrespondentList()" translate>re-send private payloads</a>
+		<span translate>If the recipient doesn't see your payment, you can</span> <a class="blue-link" style="padding: 0" ng-click="showCorrespondentList()" translate>re-send private payloads</a>
     </li>
     <li ng-if="n > 1 && isPrivate" class="line-b p10 oh">
-		If any of your cosigner devices doesn't see this payment, you can <a class="blue-link" style="padding: 0" ng-click="reSendPrivateMultiSigPayment()" translate>re-send private payloads to cosigners</a>
+		<span translate>If any of your cosigner devices doesn't see this payment, you can</span> <a class="blue-link" style="padding: 0" ng-click="reSendPrivateMultiSigPayment()" translate>re-send private payloads to cosigners</a>
     </li>
   </ul>
 

public/views/walletHome.html

@@ -292,7 +292,7 @@ <h4 ng-class="{'enable_text_select': !index.isCordova}" class="size-12">
           </div>
         </div>
         <div class="m20t text-center m30b">
-	        <div class="text-center hor-link" ng-show="!home.generatingAddress && home.addr[index.walletId]">
+	        <div class="text-center hor-link" ng-show="!home.generatingAddress && home.addr[index.walletId]" ng-style="{'max-width' : (index.shared_address ? '100%' : '45%')}">
 	          <a class="size-14" ng-click="home.openCustomizedAmountModal(index.shared_address || home.addr[index.walletId])" ng-style="{'color':index.backgroundColor}">
 	            <span translate>Request a specific amount</span>
 	          </a>
@@ -408,7 +408,7 @@ <h4 class="title m0">
 	                  {{index.addressbook[_address] || _address}}
 	                </div>-->
 	                <a class="postfix size-12 m0 text-gray" ng-hide="home.blockUx || home.lockAddress" ng-click="openDestinationAddressModal(index.otherWallets, _address)">
-	                  <i class="icon-wallet size-18"></i>
+	                  <i class="icon-wallet size-18" style="margin-right: -3px"></i>
 	                </a>
 	              </div>
 				  <div ng-if="home.deviceAddressIsKnown()" style="font-size: 11px; font-weight: bold; margin-top: -1.5rem; margin-bottom: 1.5rem">
@@ -658,6 +658,12 @@ <h4 class="title m0" style="padding:0 10px;">
             <div ng-show="!btx.message">
               <span translate>To</span>: {{index.addressbook[btx.addressTo] || btx.addressTo}} 
             </div>
+            <span ng-show="btx.textAddress" class="small-10">
+              <span translate>To email</span>: {{btx.textAddress}} 
+            </span>
+            <span ng-show="btx.isTextcoin" class="small-2 right">
+              <span class="label tu light-gray radius">textcoin</span>
+            </span>
           </div>
         </div>
 

src/js/controllers/index.js

@@ -1516,9 +1516,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     go.walletHome();
   });
 
-  $rootScope.$on('Local/SetTab', function(event, tab, reset) {
+  $rootScope.$on('Local/SetTab', function(event, tab, reset, swtichToHome) {
     console.log("SetTab "+tab+", reset "+reset);
-    self.setTab(tab, reset);
+    self.setTab(tab, reset, null, swtichToHome);
   });
 
   $rootScope.$on('Local/RequestTouchid', function(event, cb) {

src/js/controllers/walletHome.js

@@ -530,7 +530,7 @@ angular.module('copayApp.controllers')
 				if (err)
 					return $rootScope.$emit('Local/ShowErrorAlert', err);
 				indexScope.updateTxHistory();
-				$rootScope.$emit('Local/SetTab', 'history');
+				$rootScope.$emit('Local/SetTab', 'history', null, true);
 			});
 		}
 		var disableClaimTextcoinListener = $rootScope.$on('claimTextcoin', function(event, mnemonic) {
@@ -1494,10 +1494,6 @@ angular.module('copayApp.controllers')
 				$scope.color = fc.backgroundColor;
 				$scope.n = fc.credentials.n;
 
-				if (btx.textAddress) btx.textcoin = true;
-				if (!ValidationUtils.isValidEmail(btx.textAddress)) {
-					btx.textAddress = "";
-				}
 				$scope.shareAgain = function() {
 					if (isCordova) {
 						if (isMobile.Android() || isMobile.Windows()) {
@@ -1509,6 +1505,41 @@ angular.module('copayApp.controllers')
 					}
 				}
 
+				$scope.eraseTextcoin = function() {
+					(function(){
+						var wallet = require('byteballcore/wallet.js');
+						var ModalInstanceCtrl = function($scope, $modalInstance, $sce) {
+							$scope.title = $sce.trustAsHtml(gettextCatalog.getString('Deleting the textcoin will remove an ability to claim it back or to resend'));
+							$scope.cancel_button_class = 'light-gray outline';
+							$scope.loading = false;
+
+							$scope.ok = function() {
+								$scope.loading = true;
+								$modalInstance.close(gettextCatalog.getString('Yes'));
+								
+								wallet.eraseTextcoin(btx.unit, btx.addressTo);
+								
+								indexScope.updateTxHistory();
+								$rootScope.$emit('Local/SetTab', 'history');
+							};
+							$scope.cancel = function() {
+								$modalInstance.dismiss(gettextCatalog.getString('No'));
+							};
+						};
+
+						var modalInstance = $modal.open({
+							templateUrl: 'views/modals/confirmation.html',
+							windowClass: animationService.modalAnimated.slideUp,
+							controller: ModalInstanceCtrl
+						});
+
+						modalInstance.result.finally(function() {
+							var m = angular.element(document.getElementsByClassName('reveal-modal'));
+							m.addClass(animationService.modalAnimated.slideOutDown);
+						});
+					})();
+				}
+
 
 				$scope.getAmount = function(amount) {
 					return self.getAmount(amount);