From 36a873261694b7f173550fb6c3395b8cfbb078b6 Mon Sep 17 00:00:00 2001
From: Tarmo Annus <tarmo888@hotmail.com>
Date: Thu, 27 Jun 2019 00:21:26 +0200
Subject: [PATCH 1/2] readable textcoin amount and usd for custom assets

---
 .../views/modals/view-prosaic-contract.html   |  4 +--
 src/js/controllers/walletHome.js              | 33 +++++++++++++++----
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/public/views/modals/view-prosaic-contract.html b/public/views/modals/view-prosaic-contract.html
index dbb1eff3f..b8516d196 100644
--- a/public/views/modals/view-prosaic-contract.html
+++ b/public/views/modals/view-prosaic-contract.html
@@ -83,10 +83,10 @@ <h3 class="person title" translate>Peer</h3>
 		</div>
 
 	<h3 class="title" translate>Title of contract</h3>
-	<span style="width: 100%; word-wrap: break-word;">{{title}}</span>
+	<span class="enable_text_select" style="width: 100%; word-wrap: break-word;">{{title}}</span>
 
 	<h3 class="title" translate>Text</h3>
-	<span style="width: 100%; word-wrap: break-word;" markdown>{{text}}</span>
+	<span class="enable_text_select" style="width: 100%; word-wrap: break-word;" markdown>{{text}}</span>
 
 	<h3 class="unit" ng-if="status === 'accepted'"><span translate>Proof of contract signing</span>: <span ng-if="unit" ng-click="expandProofBlock()" class="validation_check">expand</span><span translate ng-if="!unit">the contract is not signed yet</span></h3>
 	
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 797d48a2b..6397924bd 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -744,17 +744,36 @@ angular.module('copayApp.controllers')
 				if (network.exchangeRates[pair]) {
 					usd_amount_str = " (≈" + ((amount/1e9)*network.exchangeRates[pair]).toLocaleString([], {maximumFractionDigits: 2}) + " USD)";
 				}
-				amount = (amount/1e9).toLocaleString([], {maximumFractionDigits: 9});
-				asset = asset == constants.BLACKBYTES_ASSET ? "GBB" : "GB";
+				if (amount >= Math.pow(10, 9)) {
+					amount = (amount/1e9).toLocaleString([], {maximumFractionDigits: 9});
+					asset = asset == constants.BLACKBYTES_ASSET ? "GBB" : "GB";
+				}
+				else if (amount >= Math.pow(10, 6)) {
+					amount = (amount/1e6).toLocaleString([], {maximumFractionDigits: 6});
+					asset = asset == constants.BLACKBYTES_ASSET ? "MBB" : "MB";
+				}
+				else if (amount >= Math.pow(10, 3)) {
+					amount = (amount/1e3).toLocaleString([], {maximumFractionDigits: 3});
+					asset = asset == constants.BLACKBYTES_ASSET ? "KBB" : "KB";
+				}
+				else {
+					amount = amount.toLocaleString([], {maximumFractionDigits: 0});
+					asset = asset == constants.BLACKBYTES_ASSET ? "Blackbytes" : "Bytes";
+				}
 			} else {
 				//indexScope.arrBalances[$scope.index.assetIndex]
 				var assetInfo = lodash.find(indexScope.arrBalances, function(balance){return balance.asset == asset});
-				if (assetInfo && assetInfo.name) {
-					asset = assetInfo.name;
-					amount /= Math.pow(10, assetInfo.decimals);
-				}
-				if (assetInfo)
+				if (assetInfo) {
 					is_private = assetInfo.is_private;
+					var pair = asset + "_USD";
+					if (network.exchangeRates[pair]) {
+						usd_amount_str = " (≈" + (amount / Math.pow(10, assetInfo.decimals || 0) * network.exchangeRates[pair]).toLocaleString([], {maximumFractionDigits: 2}) + " USD)";
+					}
+					if (assetInfo.decimals) {
+						amount /= Math.pow(10, assetInfo.decimals);
+					}
+					asset = assetInfo.name ? assetInfo.name : asset;
+				}
 			}
 			return {
 				message: "Here is your " + (is_private ? "file" : "link") + " to receive " + amount + " " + asset + usd_amount_str + (is_private ? ".  If you don't have a Obyte wallet yet, install it from https://obyte.org." : (": https://obyte.org/#textcoin?" + mnemonic)),

From 9ae21bdda2af38fef3d0a2f06bad958647ac9c7e Mon Sep 17 00:00:00 2001
From: Tarmo Annus <tarmo888@hotmail.com>
Date: Thu, 27 Jun 2019 04:02:33 +0200
Subject: [PATCH 2/2] smart-address selectable

---
 public/views/modals/address-definition.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/views/modals/address-definition.html b/public/views/modals/address-definition.html
index 13613b5b3..7bfab0be4 100644
--- a/public/views/modals/address-definition.html
+++ b/public/views/modals/address-definition.html
@@ -13,7 +13,7 @@ <h1 class="title ellipsis" ng-style="{'color':color}" translate>
 
 
 <div class="modal-content fix-modals-touch">
-	<div class="row columns m20t">{{address}} <span translate>can be spent if:</span></div>
+	<div class="row columns m20t enable_text_select">{{address}} <span translate>can be spent if:</span></div>
 	<div class="row columns m20t size-14 center enable_text_select" dynamic="humanReadableDefinition"></div>
 	<div class="row columns m20t size-14">
 		<span class="text-gray" translate>Peer:</span>