From 59b6e63297a14566b2a5eacd17ec80f27df8a0eb Mon Sep 17 00:00:00 2001
From: Javier Varona <javier@contimita.com>
Date: Tue, 18 Sep 2018 22:25:07 -0400
Subject: [PATCH] =?UTF-8?q?-=20Removed=20the=20label=20"0.003=E2=82=AC"=20?=
 =?UTF-8?q?from=20the=20balance=20item=20header=20-=20Changed=20the=20labe?=
 =?UTF-8?q?l=20"cancel"=20to=20"ok"=20in=20the=20backup=20seed=20page=20-?=
 =?UTF-8?q?=20The=20user=20can't=20get=20back=20once=20he/she=20entered=20?=
 =?UTF-8?q?the=20backup=20seed=20page=20-=20When=20the=20"ok"=20button=20i?=
 =?UTF-8?q?s=20pressed=20in=20the=20backup=20seed=20page,=20the=20user=20g?=
 =?UTF-8?q?ets=20to=20the=20balance=20page=20(and=20not=20the=20creation?=
 =?UTF-8?q?=20seed=20page)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crystalwallet/activities/BackupSeedActivity.java        | 5 ++++-
 .../agorise/crystalwallet/activities/CreateSeedActivity.kt  | 1 +
 app/src/main/res/layout/backup_seed.xml                     | 6 +++---
 app/src/main/res/layout/balance_list_item.xml               | 3 +--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/BackupSeedActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/BackupSeedActivity.java
index 1e4ebbc..db40e29 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/BackupSeedActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BackupSeedActivity.java
@@ -68,7 +68,10 @@ public class BackupSeedActivity extends AppCompatActivity {
 
     @OnClick(R.id.btnCancel)
     public void btnOkClick(){
-        finish();
+        Intent intent = new Intent(this, BoardActivity.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        startActivity(intent);
+        //finish();
     }
 
     /*
diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.kt b/app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.kt
index 5eb9400..fa12a2c 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.kt
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.kt
@@ -181,6 +181,7 @@ class CreateSeedActivity : CustomActivity() {
             if (request.status == ValidateCreateBitsharesAccountRequest.StatusCode.SUCCEEDED) {
                 val accountSeed = request.account
                 val intent = Intent(applicationContext, BackupSeedActivity::class.java)
+                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                 intent.putExtra("SEED_ID", accountSeed.id)
                 startActivity(intent)
             } else {
diff --git a/app/src/main/res/layout/backup_seed.xml b/app/src/main/res/layout/backup_seed.xml
index 2898319..511b6b9 100644
--- a/app/src/main/res/layout/backup_seed.xml
+++ b/app/src/main/res/layout/backup_seed.xml
@@ -67,9 +67,9 @@
             android:layout_marginLeft="20dp"
             android:layout_marginTop="35dp"
             android:layout_toLeftOf="@+id/btnCopy"
-            android:text="@string/cancel"
-            android:textColor="#0099ff"
-            android:background="?android:attr/selectableItemBackground"/>
+            android:background="?android:attr/selectableItemBackground"
+            android:text="@string/ok"
+            android:textColor="#0099ff" />
 
         <Button
             android:id="@+id/btnCopy"
diff --git a/app/src/main/res/layout/balance_list_item.xml b/app/src/main/res/layout/balance_list_item.xml
index 0c65a38..5dbd7c9 100644
--- a/app/src/main/res/layout/balance_list_item.xml
+++ b/app/src/main/res/layout/balance_list_item.xml
@@ -44,8 +44,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:text="0.003€" />
+                android:layout_centerVertical="true" />
 
             <Button
                 android:id="@+id/btnSendFromThisAccount"