From 5163e9617c90afe8292b5d6f7d392faf2153fb99 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 8 Sep 2015 15:42:55 -0300
Subject: [PATCH] Improves wording

---
 public/views/buyGlidera.html      | 10 +++++-----
 public/views/glidera.html         | 18 ++++++++----------
 public/views/sellGlidera.html     |  4 ++--
 src/js/controllers/sellGlidera.js |  2 +-
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/public/views/buyGlidera.html b/public/views/buyGlidera.html
index 910a093b2..05cbc0686 100644
--- a/public/views/buyGlidera.html
+++ b/public/views/buyGlidera.html
@@ -57,7 +57,7 @@
       <div ng-show="buy.show2faCodeInput && !buy.success">
         <p class="text-gray" translate>
         ${{buy.buyPrice.price}} {{buy.buyPrice.currency}} will be immediately withdrawn from your
-        bank account. The total of {{buy.buyPrice.qty}} BTC will be purchased and deposited in your bitcoin wallet ({{index.walletName}}) in 2-4 business days.
+        bank account. The total of {{buy.buyPrice.qty}} BTC will be purchased and deposited to your bitcoin wallet ({{index.walletName}}) in 2-4 business days.
         </p>
         <p class="text-gray" translate>
           A SMS containing a confirmation code was sent to your phone. Please, enter code below
@@ -77,14 +77,14 @@
         </span>
       </div>
       <div class="text-center" ng-show="buy.success">
-        <h1 translate>Purchase complete</h1>
+        <h1 translate>Purchase initiated</h1>
         <p class="text-gray" translate>
-        A transfer has been initiated from your bank account. Your bitcoin should arrive in your wallet in 4-6 business days.
+        A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 4-6 business days.
         </p>
 
         <button class="outline dark-gray round expand"
-          ng-click="$root.go('glidera')" translate>
-          Finish
+          ng-click="$root.go('glidera')">
+          OK
         </button>
       </div>
     </div>
diff --git a/public/views/glidera.html b/public/views/glidera.html
index 806ae8678..b9cfd4ebd 100644
--- a/public/views/glidera.html
+++ b/public/views/glidera.html
@@ -88,18 +88,16 @@
 
       <div ng-show="index.glideraPersonalInfo" class="size-12">
         {{index.glideraPersonalInfo.firstName}} {{index.glideraPersonalInfo.lastName}}
-        <span ng-show="index.glideraStatus.personalInfoState != 'VERIFIED'">({{index.glideraStatus.personalInfoState}})</span>
       </div>
 
-      <div class="text-warning size-12" ng-show="!index.glideraStatus.userPhoneIsSetup" translate>
-        You need to setup a phone number
-      </div>
-      <div class="text-warning size-12" ng-show="!index.glideraStatus.userBankAccountIsSetup" translate>
-        You need to setup a bank account
-      </div>
-      <div class="text-gray size-12" 
-        ng-show="index.glideraStatus.userBankAccountIsSetup && index.glideraStatus.bankAccountState != 'VERIFIED'" translate>
-        Bank account state: {{index.glideraStatus.bankAccountState}}
+      <div class="text-warning size-12 m20t" 
+        ng-show="!index.glideraStatus.userPhoneIsSetup || (!index.glideraStatus.userBankAccountIsSetup &&
+        index.glideraStatus.bankAccountState != 'VERIFIED')" translate>
+        Your Glidera account is not ready to transact. Please, verify it at 
+        <a href 
+          ng-init="glideraUrl = index.network == 'testnet' ? 'https://sandbox.glidera.io/login' :
+          'https://glidera.io/login'"
+          ng-click="$root.openExternalLink(glideraUrl)">Glidera.io</a>
       </div>
     </div>
 
diff --git a/public/views/sellGlidera.html b/public/views/sellGlidera.html
index a0f0e17c9..752ca5689 100644
--- a/public/views/sellGlidera.html
+++ b/public/views/sellGlidera.html
@@ -77,13 +77,13 @@
         </span>
       </div>
       <div class="text-center" ng-show="sell.success">
-        <h1 translate>Sale complete</h1>
+        <h1 translate>Sale initiated</h1>
         <p class="text-gray" translate>
         A transfer has been initiated to your bank account and should arrive in 4-6 business days.
         </p>
 
         <button class="outline dark-gray round expand"
-          ng-click="$root.go('glidera')" translate>Finish</button>
+          ng-click="$root.go('glidera')">OK</button>
       </div>
     </div>
   </div>
diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js
index 278ae4933..77b5e5a0b 100644
--- a/src/js/controllers/sellGlidera.js
+++ b/src/js/controllers/sellGlidera.js
@@ -72,7 +72,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
               fc.sendTxProposal({
                 toAddress: sellAddress,
                 amount: amount,
-                message: 'Glidera',
+                message: 'Glidera transaction',
                 customData: {'glideraToken': token},
                 payProUrl: null,
                 feePerKb: feePerKb,