Merge pull request byteball#258 from kakysha/master

fixes for send-email

Author: tonyofbyteball

public/views/modals/tx-details.html

@@ -126,7 +126,7 @@ <h4 class="title m0" translate>Details</h4>
 	        not claimed
 	   	</span>
 	      <span ng-show="!btx.claimed" class="external-link">
-	      	(<a href="#" ng-click="$root.$emit('claimTextcoin', btx.mnemonic.split('-').join(' '));cancel()" style="padding: 0; color: inherit;">claim back</a>)
+	      	(<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>
 	        claimed by {{btx.claimedByMe?'me':'receiver'|translate}}

public/views/walletHome.html

@@ -374,7 +374,7 @@ <h4 class="title m0">
 
 		    <div class="mtab" ng-class="{'active': mtab == 1}" ng-init="mtab = 1">
 	            <div ng-hide="home.hideAddress">
-	              <div class="row collapse">
+	              <div class="row collapse" style="padding-top: 5px;">
 	              	<label for="address" class="left" ng-if="index.arrBalances.length > 0 && index.arrBalances[index.assetIndex].asset !== 'base'">
 	                  <span translate>To byteball address</span>
 	                </label>

src/js/controllers/walletHome.js

@@ -525,14 +525,29 @@ angular.module('copayApp.controllers')
 		function claimTextCoin(mnemonic, addr) {
 			var wallet = require('byteballcore/wallet.js');
 			wallet.receiveTextCoin(mnemonic, addr, function(err, unit) {
+				$rootScope.$emit('closeModal');
 				if (err)
 					return $rootScope.$emit('Local/ShowErrorAlert', err);
 				indexScope.updateTxHistory();
 				$rootScope.$emit('Local/SetTab', 'history');
 			});
 		}
 		$rootScope.$on('claimTextcoin', function(event, mnemonic) {
-			claimTextCoin(mnemonic, self.addr[profileService.focusedClient.credentials.walletId]);
+			var addr = self.addr[profileService.focusedClient.credentials.walletId];
+			if (addr) {
+				claimTextCoin(mnemonic, addr);
+			} else {
+				addressService.getAddress(profileService.focusedClient.credentials.walletId, false, function(err, addr) {
+					if (addr) {
+						self.addr[profileService.focusedClient.credentials.walletId] = addr;
+						claimTextCoin(mnemonic, addr);
+					}
+
+					$timeout(function() {
+						$scope.$digest();
+					});
+				});
+			}
 		});
 
 		// Send 
@@ -680,8 +695,8 @@ angular.module('copayApp.controllers')
 			};
 		};
 
-		this.openShareTextcoinModal = function(addr, mnemonic, isResend) {
-			var text = "Your link: https://byteball.org/openapp.html#textcoin?" + mnemonic;
+		this.openShareTextcoinModal = function(addr, mnemonic, amount, isResend) {
+			var text = "Your link to claim " + amount + " bytes : https://byteball.org/openapp.html#textcoin?" + mnemonic;
 			var subject = "Byteball user beamed you money";
 			$rootScope.modalOpened = true;
 			var fc = profileService.focusedClient;
@@ -994,17 +1009,18 @@ angular.module('copayApp.controllers')
 								var mnemonic = mnemonics[address];						
 
 								if (isEmail) {
-									self.openShareTextcoinModal(address.slice("textcoin:".length), mnemonic);
+									self.openShareTextcoinModal(address.slice("textcoin:".length), mnemonic, amount-constants.TEXTCOIN_CLAIM_FEE);
 								} else {
 									if (isCordova) {
 										if (isMobile.Android() || isMobile.Windows()) {
 											window.ignoreMobilePause = true;
 										}
 										window.plugins.socialsharing.shareWithOptions({
-											message: "Here is your link to receive bytes https://byteball.org/openapp.html#textcoin?" + mnemonic, subject: "Byteball user beamed you money"
+
+											message: "Here is your link to receive "+(amount-constants.TEXTCOIN_CLAIM_FEE)+" bytes https://byteball.org/openapp.html#textcoin?" + mnemonic, subject: "Byteball user beamed you money"
 										});
 									} else {
-										self.openShareTextcoinModal(null, mnemonic);
+										self.openShareTextcoinModal(null, mnemonic, amount-constants.TEXTCOIN_CLAIM_FEE);
 									}
 								}
 
@@ -1044,7 +1060,7 @@ angular.module('copayApp.controllers')
 				$scope.index.assetIndex = $scope.assetIndexSelectorValue;
 				this.shownForm = 'payment';
 			}
-			//$scope.$apply();
+			this.resetForm();
 		}
 
 		this.submitData = function() {
@@ -1480,10 +1496,10 @@ angular.module('copayApp.controllers')
 							window.ignoreMobilePause = true;
 						}
 						window.plugins.socialsharing.shareWithOptions({
-							message: "Here is your link to receive bytes: https://byteball.org/openapp.html#textcoin?" + btx.mnemonic, subject: "Byteball user beamed you money"
+							message: "Here is your link to receive "+(btx.amount-constants.TEXTCOIN_CLAIM_FEE)+" bytes: https://byteball.org/openapp.html#textcoin?" + btx.mnemonic, subject: "Byteball user beamed you money"
 						});
 					} else {
-						self.openShareTextcoinModal(btx.textAddress, btx.mnemonic, true);
+						self.openShareTextcoinModal(btx.textAddress, btx.mnemonic, btx.amount-constants.TEXTCOIN_CLAIM_FEE, true);
 					}
 				}