diff --git a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.java b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.java index ff7e2aba3b..a23441675e 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.java +++ b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.java @@ -126,15 +126,15 @@ public class PurgeActivity extends AppCompatActivity implements NfcAdapter.Reade MainActivity.commonInit(getApplicationContext()); + mCard = new TangemCard(getIntent().getStringExtra("UID")); + mCard.LoadFromBundle(getIntent().getExtras().getBundle("Card")); + TextView tvCardID = findViewById(R.id.tvCardID); progressBar = findViewById(R.id.progressBar); tvCardID.setText(mCard.getCIDDescription()); progressBar.setProgressTintList(ColorStateList.valueOf(Color.DKGRAY)); progressBar.setVisibility(View.INVISIBLE); - - mCard = new TangemCard(getIntent().getStringExtra("UID")); - mCard.LoadFromBundle(getIntent().getExtras().getBundle("Card")); } @Override diff --git a/app/src/main/res/layout/activity_create_new_wallet.xml b/app/src/main/res/layout/activity_create_new_wallet.xml index e7b8d5dd02..38e42e782c 100644 --- a/app/src/main/res/layout/activity_create_new_wallet.xml +++ b/app/src/main/res/layout/activity_create_new_wallet.xml @@ -1,7 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_purge.xml b/app/src/main/res/layout/activity_purge.xml index ef9111325c..b8fa5d8205 100644 --- a/app/src/main/res/layout/activity_purge.xml +++ b/app/src/main/res/layout/activity_purge.xml @@ -14,7 +14,6 @@ android:orientation="vertical"> + tools:text="CB02 0000 0002 5000"/> + + - diff --git a/app/src/main/res/layout/activity_swap_pin.xml b/app/src/main/res/layout/activity_swap_pin.xml index 120c1d91a2..d4ca158fbd 100644 --- a/app/src/main/res/layout/activity_swap_pin.xml +++ b/app/src/main/res/layout/activity_swap_pin.xml @@ -1,7 +1,6 @@ + android:textSize="@dimen/text_size_large" + tools:text="24234234"/> - + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_progress_horizontal.xml b/app/src/main/res/layout/layout_progress_horizontal.xml new file mode 100644 index 0000000000..33a82d00f4 --- /dev/null +++ b/app/src/main/res/layout/layout_progress_horizontal.xml @@ -0,0 +1,13 @@ + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 553643a8e0..212de0ff07 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -119,6 +119,7 @@ to erase the wallet to sign the payment to change PIN/PIN2 codes + By tapping the card, you will permanently remove the blockchain wallet. Ensure there will be no further incoming transactions Send payment