From 8a0b65466332a5148c5abeab19755ab756afef73 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 30 May 2018 13:49:21 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .idea/caches/build_file_checksums.ser         | Bin 536 -> 536 bytes
 app/build.gradle                              |  15 ++-
 app/src/debug/res/values/strings.xml          |   6 ++
 .../main/java/com/tangem/LogFileProvider.java |   2 +-
 .../main/res/layout/activity_card_info.xml    |  33 +++---
 .../res/layout/activity_confirm_payment.xml   |  69 ++++++------
 .../res/layout/activity_create_new_wallet.xml |  20 ++--
 .../main/res/layout/activity_empty_wallet.xml | 102 +++++++++---------
 .../res/layout/activity_loaded_wallet.xml     |  37 +++----
 app/src/main/res/layout/activity_logo.xml     |   9 +-
 app/src/main/res/layout/activity_main.xml     |  17 +--
 .../res/layout/activity_prepare_payment.xml   |  42 ++++----
 app/src/main/res/layout/activity_purge.xml    |  19 ++--
 app/src/main/res/layout/activity_qrscan.xml   |   5 +-
 .../main/res/layout/activity_request_pin.xml  |  76 ++++++-------
 app/src/main/res/layout/activity_save_pin.xml |  42 ++++----
 .../res/layout/activity_select_blockchain.xml |  12 ++-
 .../res/layout/activity_send_transaction.xml  |   9 +-
 .../main/res/layout/activity_sign_payment.xml |  21 ++--
 app/src/main/res/layout/activity_swap_pin.xml |  21 ++--
 .../main/res/layout/activity_verify_card.xml  |  11 +-
 app/src/main/res/values/strings.xml           |   9 +-
 .../res/values/strings_untranslatable.xml     |  10 ++
 app/src/release/res/values/strings.xml        |   6 ++
 24 files changed, 314 insertions(+), 279 deletions(-)
 create mode 100644 app/src/debug/res/values/strings.xml
 create mode 100644 app/src/main/res/values/strings_untranslatable.xml
 create mode 100644 app/src/release/res/values/strings.xml

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index f5952dda1bbf4d27d19039597fb3820e71cd23d1..1257b1e56c8f11da0ee7989905d03481fc8f106e 100644
GIT binary patch
delta 33
rcmV++0N($Y1egSnm;|t?TV%1EYXK1}vA8iU8^a3F@o7S~;rG~h=@JiX

delta 33
rcmV++0N($Y1egSnm;|je4(zd<YXK3#iH!N*OtsNo?6~RF@OMLa1hNro

diff --git a/app/build.gradle b/app/build.gradle
index c7f95c1e96..c60a3b80f4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,15 +8,23 @@ android {
         applicationId "com.tangem.wallet"
         minSdkVersion 23
         targetSdkVersion 27
-        versionCode 1
+        versionCode 26
         versionName "0.85.5.831.dev"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
+            debuggable false
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.debug
+        }
+        debug {
+            debuggable true
+            minifyEnabled false
+//            applicationIdSuffix ".debug"
+            signingConfig signingConfigs.debug
         }
     }
 
@@ -29,7 +37,6 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support:design:27.1.1'
     implementation 'com.android.support:support-compat:27.1.1'
@@ -40,11 +47,11 @@ dependencies {
     implementation 'com.google.dagger:dagger:2.13'
     implementation 'com.madgag.spongycastle:core:1.56.0.0'
     implementation 'com.madgag.spongycastle:prov:1.56.0.0'
+    implementation 'com.scottyab:rootbeer-lib:0.0.6'
+    implementation 'com.skyfishjy.ripplebackground:library:1.0.1'
     implementation 'org.bitcoinj:bitcoinj-parent:0.14.4'
     implementation 'org.bitcoinj:bitcoinj-core:0.14.4'
     implementation 'me.dm7.barcodescanner:zxing:1.9.8'
-    implementation 'com.scottyab:rootbeer-lib:0.0.6'
-    implementation 'com.skyfishjy.ripplebackground:library:1.0.1'
     implementation 'info.hoang8f:android-segmented:1.0.6'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
new file mode 100644
index 0000000000..3012451cdf
--- /dev/null
+++ b/app/src/debug/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Tangem Access DEV</string>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/LogFileProvider.java b/app/src/main/java/com/tangem/LogFileProvider.java
index 8a0a3efd35..27ca312499 100644
--- a/app/src/main/java/com/tangem/LogFileProvider.java
+++ b/app/src/main/java/com/tangem/LogFileProvider.java
@@ -20,7 +20,7 @@ public class LogFileProvider extends ContentProvider {
     private static final String CLASS_NAME = "LogFileProvider";
 
     // The authority is the symbolic name for the provider class
-    public static final String AUTHORITY = "com.tangem.wallet.LogFileProvider";
+    public static final String AUTHORITY = "com.tangem.LogFileProvider";
 
     // UriMatcher used to match against incoming requests
     private UriMatcher uriMatcher;
diff --git a/app/src/main/res/layout/activity_card_info.xml b/app/src/main/res/layout/activity_card_info.xml
index 228a73d245..434e6a4a2c 100644
--- a/app/src/main/res/layout/activity_card_info.xml
+++ b/app/src/main/res/layout/activity_card_info.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="com.tangem.wallet.com.tangem.presentation.activity.CardInfoActivity">
+    tools:context="com.tangem.presentation.activity.CardInfoActivity">
 
     <android.support.design.widget.AppBarLayout
         android:id="@+id/appbar"
@@ -16,19 +17,19 @@
         android:theme="@style/AppTheme.AppBarOverlay">
 
         <!--<android.support.v7.widget.Toolbar-->
-            <!--android:id="@+id/toolbar"-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="?attr/actionBarSize"-->
-            <!--android:background="?attr/colorPrimary"-->
-            <!--app:layout_scrollFlags="scroll|enterAlways"-->
-            <!--app:popupTheme="@style/AppTheme.PopupOverlay">-->
+        <!--android:id="@+id/toolbar"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="?attr/actionBarSize"-->
+        <!--android:background="?attr/colorPrimary"-->
+        <!--app:layout_scrollFlags="scroll|enterAlways"-->
+        <!--app:popupTheme="@style/AppTheme.PopupOverlay">-->
 
         <!--</android.support.v7.widget.Toolbar>-->
 
         <android.support.design.widget.TabLayout
             android:id="@+id/tabs"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"/>
 
     </android.support.design.widget.AppBarLayout>
 
@@ -36,14 +37,14 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
     <!--<android.support.design.widget.FloatingActionButton-->
-        <!--android:id="@+id/fab"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_gravity="end|bottom"-->
-        <!--android:layout_margin="@dimen/fab_margin"-->
-        <!--app:srcCompat="@android:drawable/ic_dialog_email" />-->
+    <!--android:id="@+id/fab"-->
+    <!--android:layout_width="wrap_content"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:layout_gravity="end|bottom"-->
+    <!--android:layout_margin="@dimen/fab_margin"-->
+    <!--app:srcCompat="@android:drawable/ic_dialog_email" />-->
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_confirm_payment.xml b/app/src/main/res/layout/activity_confirm_payment.xml
index d0085c2bf7..5270149e44 100644
--- a/app/src/main/res/layout/activity_confirm_payment.xml
+++ b/app/src/main/res/layout/activity_confirm_payment.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.tangem.wallet.com.tangem.presentation.activity.ConfirmPaymentActivity">
+    tools:context="com.tangem.presentation.activity.ConfirmPaymentActivity">
 
     <TextView
         android:id="@+id/textView"
@@ -19,7 +20,7 @@
         android:textSize="@dimen/font_large"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"/>
 
 
     <LinearLayout
@@ -43,7 +44,7 @@
             android:fontFamily="@font/raleway_r"
             android:text="From banknote"
             android:textColor="@color/primary"
-            android:textSize="@dimen/font_normal" />
+            android:textSize="@dimen/font_normal"/>
 
         <TextView
             android:id="@+id/tvCardID"
@@ -55,7 +56,7 @@
             android:text="    "
             android:textColor="@color/black"
             android:textSize="@dimen/font_normal"
-            android:textStyle="bold" />
+            android:textStyle="bold"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -65,7 +66,7 @@
             android:fontFamily="@font/raleway_r"
             android:text="with balance"
             android:textColor="@color/primary"
-            android:textSize="@dimen/font_normal" />
+            android:textSize="@dimen/font_normal"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -83,7 +84,7 @@
                 android:text="    "
                 android:textColor="@color/black"
                 android:textSize="@dimen/font_normal"
-                android:textStyle="bold" />
+                android:textStyle="bold"/>
 
             <TextView
                 android:id="@+id/tvBalanceEquivalent"
@@ -94,7 +95,7 @@
                 android:fontFamily="@font/montserrat_light"
                 android:text="   "
                 android:textColor="@android:color/darker_gray"
-                android:textSize="14dp" />
+                android:textSize="14dp"/>
         </LinearLayout>
 
 
@@ -117,7 +118,7 @@
                 android:textSize="@dimen/font_normal"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"/>
         </android.support.constraint.ConstraintLayout>
 
         <EditText
@@ -134,7 +135,7 @@
             android:padding="12dp"
             android:textColor="@color/black"
             android:textSize="14dp"
-            android:textStyle="bold" />
+            android:textStyle="bold"/>
 
         <android.support.constraint.ConstraintLayout
             android:layout_width="match_parent"
@@ -152,7 +153,7 @@
                 android:textSize="@dimen/font_normal"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
                 android:id="@+id/textView12"
@@ -165,7 +166,7 @@
                 android:textColor="@color/primary"
                 android:textSize="14sp"
                 app:layout_constraintBottom_toBottomOf="@+id/textView3"
-                app:layout_constraintLeft_toRightOf="@+id/textView3" />
+                app:layout_constraintLeft_toRightOf="@+id/textView3"/>
 
         </android.support.constraint.ConstraintLayout>
 
@@ -195,7 +196,7 @@
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toLeftOf="@+id/tvCurrency"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
                 android:id="@+id/tvCurrency"
@@ -208,7 +209,7 @@
                 android:textSize="24dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/tvAmountEquivalent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
                 android:id="@+id/tvAmountEquivalent"
@@ -222,7 +223,7 @@
                 android:textSize="14dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"/>
 
         </android.support.constraint.ConstraintLayout>
 
@@ -253,7 +254,7 @@
                 android:textSize="@dimen/font_normal"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <!--<RadioGroup-->
             <!--android:id="@+id/rgFee"-->
@@ -292,16 +293,16 @@
 
             <!--</RadioGroup>-->
             <info.hoang8f.android.segmented.SegmentedGroup xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/rgFee"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="10dp"
-                android:checkedButton="@+id/rbNormalFee"
-                android:gravity="center"
-                android:orientation="horizontal"
-                app:sc_border_width="2dp"
-                app:sc_corner_radius="10dp"
-                app:sc_tint_color="@color/colorPrimary">
+                                                           android:id="@+id/rgFee"
+                                                           android:layout_width="match_parent"
+                                                           android:layout_height="wrap_content"
+                                                           android:layout_margin="10dp"
+                                                           android:checkedButton="@+id/rbNormalFee"
+                                                           android:gravity="center"
+                                                           android:orientation="horizontal"
+                                                           app:sc_border_width="2dp"
+                                                           app:sc_corner_radius="10dp"
+                                                           app:sc_tint_color="@color/colorPrimary">
 
                 <RadioButton
                     android:id="@+id/rbMinimalFee"
@@ -310,7 +311,7 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/raleway_r"
                     android:text="Minimal"
-                    android:textSize="18dp" />
+                    android:textSize="18dp"/>
 
                 <RadioButton
                     android:id="@+id/rbNormalFee"
@@ -319,7 +320,7 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/raleway_r"
                     android:text="Normal"
-                    android:textSize="18dp" />
+                    android:textSize="18dp"/>
 
                 <RadioButton
                     android:id="@+id/rbMaximumFee"
@@ -328,7 +329,7 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/raleway_r"
                     android:text="Priority"
-                    android:textSize="18dp" />
+                    android:textSize="18dp"/>
             </info.hoang8f.android.segmented.SegmentedGroup>
 
         </LinearLayout>
@@ -356,7 +357,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintWidth_min="150dp" />
+                app:layout_constraintWidth_min="150dp"/>
 
             <TextView
                 android:id="@+id/tvCurrency2"
@@ -370,7 +371,7 @@
                 android:textSize="18dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toRightOf="@+id/etFee"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
                 android:id="@+id/tvFeeEquivalent"
@@ -383,7 +384,7 @@
                 android:textSize="14dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toRightOf="@+id/tvCurrency2"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"/>
 
 
         </android.support.constraint.ConstraintLayout>
@@ -404,7 +405,7 @@
         android:textSize="@dimen/font_large"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent" />
+        app:layout_constraintRight_toRightOf="parent"/>
 
     <ProgressBar
         android:id="@+id/progressBar"
@@ -418,6 +419,6 @@
         android:visibility="invisible"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/llFee" />
+        app:layout_constraintTop_toTopOf="@+id/llFee"/>
 
 </android.support.constraint.ConstraintLayout>
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 7cd072630e..8ab3b402d4 100644
--- a/app/src/main/res/layout/activity_create_new_wallet.xml
+++ b/app/src/main/res/layout/activity_create_new_wallet.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.tangem.wallet.com.tangem.presentation.activity.CreateNewWalletActivity">
+    tools:context="com.tangem.presentation.activity.CreateNewWalletActivity">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
         android:layout_centerVertical="true"
-        >
+        android:orientation="vertical">
 
         <TextView
             android:layout_width="match_parent"
@@ -18,7 +19,7 @@
             android:fontFamily="@font/raleway_r"
             android:text="Now touch the banknote with ID"
             android:textAlignment="center"
-            android:textSize="@dimen/font_normal" />
+            android:textSize="@dimen/font_normal"/>
 
         <TextView
             android:id="@+id/tvCardID"
@@ -30,7 +31,7 @@
             android:text="           "
             android:textAlignment="center"
             android:textColor="@color/black"
-            android:textSize="@dimen/font_large" />
+            android:textSize="@dimen/font_large"/>
 
         <TextView
             android:layout_width="match_parent"
@@ -38,8 +39,9 @@
             android:fontFamily="@font/raleway_r"
             android:text="to create the wallet"
             android:textAlignment="center"
-            android:textSize="@dimen/font_normal" />
+            android:textSize="@dimen/font_normal"/>
     </LinearLayout>
+
     <ProgressBar
         android:id="@+id/progressBar"
         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
@@ -49,8 +51,6 @@
         android:layout_marginBottom="6dp"
         android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
-        app:layout_constraintBottom_toBottomOf="parent" />
-
-
+        app:layout_constraintBottom_toBottomOf="parent"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_empty_wallet.xml b/app/src/main/res/layout/activity_empty_wallet.xml
index 5d4d38702f..b5aab69e59 100644
--- a/app/src/main/res/layout/activity_empty_wallet.xml
+++ b/app/src/main/res/layout/activity_empty_wallet.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -7,21 +8,21 @@
     android:background="@color/white"
     android:orientation="vertical"
     android:padding="0dp"
-    tools:context="com.tangem.wallet.com.tangem.presentation.activity.EmptyWalletActivity">
+    tools:context="com.tangem.presentation.activity.EmptyWalletActivity">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="20dp">
+        android:layout_marginBottom="20dp"
+        android:layout_marginTop="20dp">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
             android:background="@color/white"
             android:gravity="center_vertical"
             android:orientation="vertical"
-            android:layout_centerInParent="true"
             android:padding="8dp">
 
             <TextView
@@ -31,8 +32,8 @@
                 android:fontFamily="@font/raleway_r"
                 android:gravity="center_vertical"
                 android:text="Wallet hasn’t been yet created"
-                android:textSize="@dimen/empty_wallet_font_normal"
-                android:textAlignment="center" />
+                android:textAlignment="center"
+                android:textSize="@dimen/empty_wallet_font_normal"/>
 
             <Button
                 android:id="@+id/btnNewWallet"
@@ -45,7 +46,7 @@
                 android:text="Create Wallet"
                 android:textColor="@color/white"
                 android:textSize="18dp"
-                android:textStyle="bold" />
+                android:textStyle="bold"/>
 
             <!--<LinearLayout-->
             <!--android:layout_width="match_parent"-->
@@ -129,11 +130,11 @@
                 <TextView
                     android:layout_width="@dimen/empty_wallet_left_col_width"
                     android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/empty_wallet_left_col_margin"
                     android:fontFamily="@font/raleway_r"
                     android:text="Blockchain"
-                    android:textSize="@dimen/empty_wallet_font_normal"
-                    android:layout_marginLeft="@dimen/empty_wallet_left_col_margin"
-                    android:textColor="@color/primary_dark" />
+                    android:textColor="@color/primary_dark"
+                    android:textSize="@dimen/empty_wallet_font_normal"/>
 
                 <TextView
                     android:id="@+id/tvBlockchain"
@@ -141,10 +142,11 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/montserrat_light"
                     android:text="                "
-                    android:textSize="@dimen/empty_wallet_font_normal"
                     android:textColor="@color/primary_dark"
-                    android:textStyle="normal|bold" />
+                    android:textSize="@dimen/empty_wallet_font_normal"
+                    android:textStyle="normal|bold"/>
             </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -153,11 +155,11 @@
                 <TextView
                     android:layout_width="@dimen/empty_wallet_left_col_width"
                     android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/empty_wallet_left_col_margin"
                     android:fontFamily="@font/raleway_r"
                     android:text="Issuer"
-                    android:layout_marginLeft="@dimen/empty_wallet_left_col_margin"
-                    android:textSize="@dimen/empty_wallet_font_normal"
-                    android:textColor="@color/primary_dark" />
+                    android:textColor="@color/primary_dark"
+                    android:textSize="@dimen/empty_wallet_font_normal"/>
 
                 <TextView
                     android:id="@+id/tvIssuer"
@@ -165,9 +167,9 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/montserrat_light"
                     android:text="                "
-                    android:textSize="@dimen/empty_wallet_font_normal"
                     android:textColor="@color/primary_dark"
-                    android:textStyle="normal|bold" />
+                    android:textSize="@dimen/empty_wallet_font_normal"
+                    android:textStyle="normal|bold"/>
             </LinearLayout>
 
             <LinearLayout
@@ -178,9 +180,9 @@
                 <TextView
                     android:layout_width="@dimen/empty_wallet_left_col_width"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/raleway_r"
                     android:layout_marginLeft="@dimen/empty_wallet_left_col_margin"
-                    android:text="" />
+                    android:fontFamily="@font/raleway_r"
+                    android:text=""/>
 
                 <TextView
                     android:id="@+id/tvIssuerData"
@@ -189,32 +191,32 @@
                     android:fontFamily="@font/montserrat_light"
                     android:text="                "
                     android:textSize="@dimen/empty_wallet_font_normal"
-                    android:textStyle="normal|bold" />
+                    android:textStyle="normal|bold"/>
             </LinearLayout>
 
             <!--<LinearLayout-->
-                <!--android:layout_width="match_parent"-->
-                <!--android:layout_height="wrap_content"-->
-                <!--android:gravity="center_vertical"-->
-                <!--android:orientation="horizontal">-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:gravity="center_vertical"-->
+            <!--android:orientation="horizontal">-->
 
-                <!--<TextView-->
-                    <!--android:layout_width="110dp"-->
-                    <!--android:layout_height="wrap_content"-->
-                    <!--android:layout_marginLeft="15dp"-->
-                    <!--android:fontFamily="@font/raleway_r"-->
-                    <!--android:text="Card ID" />-->
+            <!--<TextView-->
+            <!--android:layout_width="110dp"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:layout_marginLeft="15dp"-->
+            <!--android:fontFamily="@font/raleway_r"-->
+            <!--android:text="Card ID" />-->
 
-                <!--<TextView-->
-                    <!--android:id="@+id/tvCardID"-->
-                    <!--android:layout_width="wrap_content"-->
-                    <!--android:layout_height="wrap_content"-->
-                    <!--android:layout_alignParentBottom="true"-->
-                    <!--android:layout_weight="1"-->
-                    <!--android:elevation="1dp"-->
-                    <!--android:fontFamily="@font/montserrat_light"-->
-                    <!--android:text="XXXX XXXX XXXX XXXX"-->
-                    <!--android:textAlignment="textStart" />-->
+            <!--<TextView-->
+            <!--android:id="@+id/tvCardID"-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:layout_alignParentBottom="true"-->
+            <!--android:layout_weight="1"-->
+            <!--android:elevation="1dp"-->
+            <!--android:fontFamily="@font/montserrat_light"-->
+            <!--android:text="XXXX XXXX XXXX XXXX"-->
+            <!--android:textAlignment="textStart" />-->
 
             <!--</LinearLayout>-->
 
@@ -261,7 +263,7 @@
                 android:textAlignment="center"
                 android:textColor="@color/primary_dark"
                 android:textSize="@dimen/empty_wallet_font_normal"
-                android:textStyle="normal|bold" />
+                android:textStyle="normal|bold"/>
 
             <TextView
                 android:id="@+id/textView5"
@@ -273,8 +275,9 @@
                 android:text="Scan again to verify the card"
                 android:textAlignment="center"
                 android:textColor="@android:color/darker_gray"
-                android:textSize="@dimen/empty_wallet_font_small" />
+                android:textSize="@dimen/empty_wallet_font_small"/>
         </LinearLayout>
+
         <ImageView
             android:id="@+id/imgBlockchain"
             android:layout_width="32dp"
@@ -283,7 +286,7 @@
             android:layout_alignParentTop="true"
             android:layout_marginRight="8dp"
             android:layout_marginTop="8dp"
-            android:src="@drawable/tangem_logo_small_new" />
+            android:src="@drawable/tangem_logo_small_new"/>
 
         <ImageView
             android:id="@+id/imgPIN"
@@ -294,7 +297,7 @@
             android:layout_margin="8dp"
             android:layout_marginRight="4dp"
             android:layout_toLeftOf="@+id/imgPIN2orSecurityDelay"
-            android:src="@drawable/unlock_pin1" />
+            android:src="@drawable/unlock_pin1"/>
 
         <ImageView
             android:id="@+id/imgPIN2orSecurityDelay"
@@ -305,7 +308,7 @@
             android:layout_alignParentStart="false"
             android:layout_marginBottom="8dp"
             android:layout_marginRight="8dp"
-            android:src="@drawable/unlock_pin2" />
+            android:src="@drawable/unlock_pin2"/>
 
         <ImageView
             android:id="@+id/imgDeveloperVersion"
@@ -315,7 +318,7 @@
             android:layout_alignParentStart="true"
             android:layout_marginBottom="8dp"
             android:layout_marginLeft="8dp"
-            android:src="@drawable/ic_developer_version" />
+            android:src="@drawable/ic_developer_version"/>
 
     </RelativeLayout>
 
@@ -329,7 +332,6 @@
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent" />
+        app:layout_constraintRight_toRightOf="parent"/>
 
-
-</android.support.constraint.ConstraintLayout>
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_loaded_wallet.xml b/app/src/main/res/layout/activity_loaded_wallet.xml
index 03cfa8a22a..61d97cb3b8 100644
--- a/app/src/main/res/layout/activity_loaded_wallet.xml
+++ b/app/src/main/res/layout/activity_loaded_wallet.xml
@@ -1,35 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.tangem.wallet.com.tangem.presentation.activity.LoadedWalletActivity">
+    tools:context="com.tangem.presentation.activity.LoadedWalletActivity">
 
     <!--<android.support.design.widget.AppBarLayout-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:theme="@style/AppTheme.AppBarOverlay">-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:theme="@style/AppTheme.AppBarOverlay">-->
 
-        <!--<android.support.v7.widget.Toolbar-->
-            <!--android:id="@+id/toolbar"-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="?attr/actionBarSize"-->
-            <!--android:background="?attr/colorPrimary"-->
-            <!--app:popupTheme="@style/AppTheme.PopupOverlay" />-->
+    <!--<android.support.v7.widget.Toolbar-->
+    <!--android:id="@+id/toolbar"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="?attr/actionBarSize"-->
+    <!--android:background="?attr/colorPrimary"-->
+    <!--app:popupTheme="@style/AppTheme.PopupOverlay" />-->
 
     <!--</android.support.design.widget.AppBarLayout>-->
 
     <include
         layout="@layout/content_loaded_wallet"
         android:layout_height="566dp"
-        tools:layout_editor_absoluteY="1dp" />
+        tools:layout_editor_absoluteY="1dp"/>
 
     <!--<android.support.design.widget.FloatingActionButton-->
-        <!--android:id="@+id/fab"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_gravity="bottom|end"-->
-        <!--android:layout_margin="@dimen/fab_margin"-->
-        <!--app:srcCompat="@android:drawable/ic_dialog_email" />-->
+    <!--android:id="@+id/fab"-->
+    <!--android:layout_width="wrap_content"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:layout_gravity="bottom|end"-->
+    <!--android:layout_margin="@dimen/fab_margin"-->
+    <!--app:srcCompat="@android:drawable/ic_dialog_email" />-->
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_logo.xml b/app/src/main/res/layout/activity_logo.xml
index 9115764ffd..dd456c34ae 100644
--- a/app/src/main/res/layout/activity_logo.xml
+++ b/app/src/main/res/layout/activity_logo.xml
@@ -1,4 +1,5 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -13,7 +14,7 @@
         android:layout_height="70dp"
         android:layout_gravity="center_vertical"
         android:baselineAligned="false"
-        android:src="@drawable/tangem_logo_full_new" />
+        android:src="@drawable/tangem_logo_full_new"/>
 
     <TextView
         android:id="@+id/AppVersion"
@@ -26,7 +27,7 @@
         android:textAlignment="center"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         android:textColor="@android:color/holo_red_light"
-        android:textSize="12dp" />
+        android:textSize="12dp"/>
 
     <TextView
         android:id="@+id/textView9"
@@ -40,6 +41,6 @@
         android:text="Smart Cash AG"
         android:textAlignment="center"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        android:textSize="12dp" />
+        android:textSize="12dp"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 24878c3738..05dd10f240 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.tangem.wallet.com.tangem.presentation.activity.MainActivity">
+    tools:context="com.tangem.presentation.activity.MainActivity">
 
     <!--<ImageView-->
     <!--android:id="@+id/ivTap"-->
@@ -37,7 +38,7 @@
                     android:id="@+id/imSmartphone"
                     android:layout_width="75dp"
                     android:layout_height="150dp"
-                    app:srcCompat="@drawable/smartphone" />
+                    app:srcCompat="@drawable/smartphone"/>
 
             </LinearLayout>
 
@@ -82,7 +83,7 @@
                     android:id="@+id/imHand"
                     android:layout_width="190dp"
                     android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/hand_card" />
+                    app:srcCompat="@drawable/hand_card"/>
             </LinearLayout>
 
         </RelativeLayout>
@@ -102,7 +103,7 @@
             android:textAllCaps="false"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="@color/primary_dark"
-            android:textSize="18dp" />
+            android:textSize="18dp"/>
 
     </LinearLayout>
 
@@ -110,7 +111,7 @@
         android:id="@+id/include2"
         layout="@layout/content_main"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"/>
 
 
     <FrameLayout
@@ -136,7 +137,7 @@
             android:layout_height="64dp"
             android:layout_margin="10dp"
             android:src="@drawable/ic_show_menu"
-            app:backgroundTint="@color/colorPrimary" />
+            app:backgroundTint="@color/colorPrimary"/>
 
         <!--<TextView-->
         <!--android:layout_width="wrap_content"-->
@@ -149,4 +150,4 @@
         <!--android:textColor="@android:color/white" />-->
     </FrameLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_prepare_payment.xml b/app/src/main/res/layout/activity_prepare_payment.xml
index 145ac93b95..82ff2954e9 100644
--- a/app/src/main/res/layout/activity_prepare_payment.xml
+++ b/app/src/main/res/layout/activity_prepare_payment.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.tangem.wallet.com.tangem.presentation.activity.PreparePaymentActivity">
+    tools:context="com.tangem.presentation.activity.PreparePaymentActivity">
 
     <TextView
         android:id="@+id/textView"
@@ -19,7 +20,7 @@
         android:textSize="@dimen/font_large"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"/>
 
 
     <LinearLayout
@@ -44,7 +45,7 @@
             android:fontFamily="@font/raleway_r"
             android:text="From banknote"
             android:textColor="@color/primary"
-            android:textSize="@dimen/font_normal" />
+            android:textSize="@dimen/font_normal"/>
 
         <TextView
             android:id="@+id/tvCardID"
@@ -56,8 +57,7 @@
             android:text="    "
             android:textColor="@color/black"
             android:textSize="@dimen/font_normal"
-            android:textStyle="bold" />
-        />
+            android:textStyle="bold"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -67,7 +67,7 @@
             android:fontFamily="@font/raleway_r"
             android:text="with balance"
             android:textColor="@color/primary"
-            android:textSize="@dimen/font_normal" />
+            android:textSize="@dimen/font_normal"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -85,8 +85,7 @@
                 android:text="    "
                 android:textColor="@color/black"
                 android:textSize="@dimen/font_normal"
-                android:textStyle="bold" />
-            />
+                android:textStyle="bold"/>
 
             <TextView
                 android:id="@+id/tvBalanceEquivalent"
@@ -97,8 +96,8 @@
                 android:fontFamily="@font/montserrat_light"
                 android:text="  "
                 android:textColor="@android:color/darker_gray"
-                android:textSize="14dp" />
-            />
+                android:textSize="14dp"/>
+
         </LinearLayout>
 
     </LinearLayout>
@@ -131,7 +130,7 @@
                 android:textSize="@dimen/font_normal"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <ImageView
                 android:id="@+id/ivCamera"
@@ -141,13 +140,12 @@
                 android:src="@drawable/qr_scan"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"/>
         </LinearLayout>
 
         <EditText
             android:id="@+id/etWallet"
             android:layout_width="match_parent"
-
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:fontFamily="@font/montserrat_light"
@@ -160,7 +158,7 @@
             android:textSize="18dp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toLeftOf="@+id/ivCamera"
-            tools:layout_editor_absoluteY="2dp" />
+            tools:layout_editor_absoluteY="2dp"/>
 
         <android.support.constraint.ConstraintLayout
             android:layout_width="match_parent"
@@ -179,7 +177,7 @@
                 android:textSize="@dimen/font_normal"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
                 android:id="@+id/textView13"
@@ -192,7 +190,7 @@
                 android:textColor="@color/primary"
                 android:textSize="14dp"
                 app:layout_constraintBottom_toBottomOf="@+id/textView3"
-                app:layout_constraintLeft_toRightOf="@+id/textView3" />
+                app:layout_constraintLeft_toRightOf="@+id/textView3"/>
         </android.support.constraint.ConstraintLayout>
 
         <android.support.constraint.ConstraintLayout
@@ -215,7 +213,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintWidth_min="150dp" />
+                app:layout_constraintWidth_min="150dp"/>
 
             <TextView
                 android:id="@+id/tvCurrency"
@@ -228,7 +226,7 @@
                 android:textColor="@color/primary"
                 android:textSize="24dp"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toRightOf="@+id/etAmount" />
+                app:layout_constraintLeft_toRightOf="@+id/etAmount"/>
 
             <TextView
                 android:id="@+id/tvAmountEquivalent"
@@ -241,9 +239,10 @@
                 android:textColor="@android:color/darker_gray"
                 android:textSize="14dp"
                 app:layout_constraintBottom_toBottomOf="@+id/tvCurrency"
-                app:layout_constraintLeft_toRightOf="@+id/tvCurrency" />
+                app:layout_constraintLeft_toRightOf="@+id/tvCurrency"/>
 
         </android.support.constraint.ConstraintLayout>
+
     </LinearLayout>
 
     <Button
@@ -260,5 +259,6 @@
         android:textSize="@dimen/font_large"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent" />
+        app:layout_constraintRight_toRightOf="parent"/>
+
 </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_purge.xml b/app/src/main/res/layout/activity_purge.xml
index 095909d609..81bb773db5 100644
--- a/app/src/main/res/layout/activity_purge.xml
+++ b/app/src/main/res/layout/activity_purge.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.tangem.wallet.com.tangem.presentation.activity.PurgeActivity">
+    tools:context="com.tangem.presentation.activity.PurgeActivity">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
         android:layout_centerVertical="true"
-        >
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/textView6"
@@ -19,7 +20,7 @@
             android:fontFamily="@font/raleway_r"
             android:text="Now touch the banknote with ID"
             android:textAlignment="center"
-            android:textSize="@dimen/font_normal" />
+            android:textSize="@dimen/font_normal"/>
 
         <TextView
             android:id="@+id/tvCardID"
@@ -31,7 +32,7 @@
             android:text="           "
             android:textAlignment="center"
             android:textColor="@color/black"
-            android:textSize="@dimen/font_large" />
+            android:textSize="@dimen/font_large"/>
 
         <TextView
             android:id="@+id/textView7"
@@ -40,7 +41,7 @@
             android:fontFamily="@font/raleway_r"
             android:text="to erase the wallet"
             android:textAlignment="center"
-            android:textSize="@dimen/font_normal" />
+            android:textSize="@dimen/font_normal"/>
 
     </LinearLayout>
 
@@ -52,8 +53,6 @@
         android:layout_alignParentBottom="true"
         android:alpha="0.5"
         android:elevation="1dp"
-        app:layout_constraintBottom_toBottomOf="parent" />
-
-
+        app:layout_constraintBottom_toBottomOf="parent"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_qrscan.xml b/app/src/main/res/layout/activity_qrscan.xml
index 90c66ce14e..9917325755 100644
--- a/app/src/main/res/layout/activity_qrscan.xml
+++ b/app/src/main/res/layout/activity_qrscan.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.tangem.wallet.com.tangem.presentation.activity.QRScanActivity">
+    tools:context="com.tangem.presentation.activity.QRScanActivity">
 
 </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_request_pin.xml b/app/src/main/res/layout/activity_request_pin.xml
index ea51f41082..5bfd185cde 100644
--- a/app/src/main/res/layout/activity_request_pin.xml
+++ b/app/src/main/res/layout/activity_request_pin.xml
@@ -1,10 +1,11 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_horizontal"
     android:orientation="vertical"
-    tools:context="com.tangem.wallet.com.tangem.presentation.activity.RequestPINActivity">
+    tools:context="com.tangem.presentation.activity.RequestPINActivity">
     <!--android:paddingBottom="@dimen/activity_vertical_margin"-->
     <!--android:paddingLeft="@dimen/activity_horizontal_margin"-->
     <!--android:paddingRight="@dimen/activity_horizontal_margin"-->
@@ -12,16 +13,16 @@
 
     <!-- Login progress -->
     <!--<android.support.design.widget.AppBarLayout-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:theme="@style/AppTheme.AppBarOverlay">-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:theme="@style/AppTheme.AppBarOverlay">-->
 
-        <!--<android.support.v7.widget.Toolbar-->
-            <!--android:id="@+id/toolbar"-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="45dp"-->
-            <!--android:background="?attr/colorPrimary"-->
-            <!--app:popupTheme="@style/AppTheme.PopupOverlay" />-->
+    <!--<android.support.v7.widget.Toolbar-->
+    <!--android:id="@+id/toolbar"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="45dp"-->
+    <!--android:background="?attr/colorPrimary"-->
+    <!--app:popupTheme="@style/AppTheme.PopupOverlay" />-->
 
     <!--</android.support.design.widget.AppBarLayout>-->
 
@@ -46,10 +47,10 @@
             android:layout_height="wrap_content"
             android:ems="10"
             android:inputType="numberPassword"
+            android:paddingBottom="16dp"
             android:singleLine="false"
             android:textAlignment="center"
-            android:paddingBottom="16dp"
-            android:textSize="36sp" />
+            android:textSize="36sp"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -60,19 +61,20 @@
                 android:id="@+id/imgFingerprint"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@mipmap/ic_fp"
                 android:layout_marginEnd="16dp"
+                android:background="@mipmap/ic_fp"
                 />
+
             <TextView
                 android:id="@+id/pin_prompt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
                 android:ems="10"
                 android:fontFamily="@font/raleway_el"
                 android:text="@string/prompt_pin"
                 android:textAlignment="center"
-                android:layout_gravity="center"
-                android:textSize="18dp" />
+                android:textSize="18dp"/>
         </LinearLayout>
 
 
@@ -81,12 +83,12 @@
             android:layout_height="match_parent">
 
             <GridLayout
+                android:id="@+id/gridLayout"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:columnCount="3"
-                android:rowCount="4"
-                android:id="@+id/gridLayout">
+                android:rowCount="4">
 
                 <Button
                     android:id="@+id/btn1"
@@ -98,7 +100,7 @@
                     android:layout_marginTop="8dp"
                     android:fontFamily="@font/montserrat_light"
                     android:text="1"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btn2"
@@ -108,7 +110,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="2"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btn3"
@@ -118,7 +120,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="3"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btn4"
@@ -128,7 +130,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="4"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btn5"
@@ -138,7 +140,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="5"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btn6"
@@ -148,7 +150,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="6"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btn7"
@@ -158,7 +160,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="7"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btn8"
@@ -168,7 +170,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="8"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btn9"
@@ -178,9 +180,9 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="9"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
-                <Space />
+                <Space/>
 
                 <Button
                     android:id="@+id/btn0"
@@ -190,7 +192,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="0"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btnBackspace"
@@ -201,7 +203,7 @@
                     android:fontFamily="@font/montserrat_light"
                     android:text="&lt;"
                     android:textColor="@color/accent"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
             </GridLayout>
 
@@ -218,18 +220,18 @@
                 android:text="OK"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_large"
-                android:textStyle="bold" />
+                android:textStyle="bold"/>
         </RelativeLayout>
 
     </LinearLayout>
 
     <!--<ProgressBar-->
-        <!--android:id="@+id/login_progress"-->
-        <!--style="?android:attr/progressBarStyleLarge"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_marginBottom="8dp"-->
-        <!--android:visibility="gone" />-->
+    <!--android:id="@+id/login_progress"-->
+    <!--style="?android:attr/progressBarStyleLarge"-->
+    <!--android:layout_width="wrap_content"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:layout_marginBottom="8dp"-->
+    <!--android:visibility="gone" />-->
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_save_pin.xml b/app/src/main/res/layout/activity_save_pin.xml
index 73a66b5432..c8461bd16e 100644
--- a/app/src/main/res/layout/activity_save_pin.xml
+++ b/app/src/main/res/layout/activity_save_pin.xml
@@ -1,10 +1,11 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_horizontal"
     android:orientation="vertical"
-    tools:context="com.tangem.wallet.com.tangem.presentation.activity.SavePINActivity">
+    tools:context="com.tangem.presentation.activity.SavePINActivity">
     <!--android:paddingBottom="@dimen/activity_vertical_margin"-->
     <!--android:paddingLeft="@dimen/activity_horizontal_margin"-->
     <!--android:paddingRight="@dimen/activity_horizontal_margin"-->
@@ -40,7 +41,7 @@
             android:paddingBottom="8dp"
             android:singleLine="false"
             android:textAlignment="center"
-            android:textSize="36sp" />
+            android:textSize="36sp"/>
 
         <TextView
             android:id="@+id/pin_prompt"
@@ -52,7 +53,7 @@
             android:paddingTop="16dp"
             android:text="@string/enter_pin_and_use_fingerprint_to_save_it"
             android:textAlignment="center"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -73,7 +74,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="1"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btn2"
@@ -83,7 +84,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="2"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btn3"
@@ -93,7 +94,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="3"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btn4"
@@ -103,7 +104,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="4"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btn5"
@@ -113,7 +114,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="5"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btn6"
@@ -123,7 +124,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="6"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btn7"
@@ -133,7 +134,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="7"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btn8"
@@ -143,7 +144,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="8"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btn9"
@@ -153,9 +154,9 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="9"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
-                <Space />
+                <Space/>
 
                 <Button
                     android:id="@+id/btn0"
@@ -165,7 +166,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="0"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
                 <Button
                     android:id="@+id/btnBackspace"
@@ -175,7 +176,7 @@
                     android:layout_marginTop="@dimen/pin_button_top_margin"
                     android:fontFamily="@font/montserrat_light"
                     android:text="&lt;"
-                    android:textSize="32dp" />
+                    android:textSize="32dp"/>
 
             </GridLayout>
 
@@ -196,7 +197,7 @@
                     android:layout_marginBottom="4dp"
                     android:drawableEnd="@mipmap/ic_fp"
                     android:drawablePadding="8dp"
-                    android:text="Protect with fingerprint" />
+                    android:text="Protect with fingerprint"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -214,7 +215,7 @@
                         android:fontFamily="@font/raleway_r"
                         android:text="Save"
                         android:textColor="@color/white"
-                        android:textSize="18dp" />
+                        android:textSize="18dp"/>
 
                     <Button
                         android:id="@+id/btnDeletePIN"
@@ -226,13 +227,14 @@
                         android:fontFamily="@font/raleway_r"
                         android:text="Delete"
                         android:textColor="@color/white"
-                        android:textSize="18dp" />
+                        android:textSize="18dp"/>
 
                 </LinearLayout>
+
             </LinearLayout>
+
         </RelativeLayout>
 
     </LinearLayout>
 
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_select_blockchain.xml b/app/src/main/res/layout/activity_select_blockchain.xml
index bff6363b6c..9cb8708307 100644
--- a/app/src/main/res/layout/activity_select_blockchain.xml
+++ b/app/src/main/res/layout/activity_select_blockchain.xml
@@ -1,8 +1,12 @@
-<LinearLayout android:layout_height="match_parent" android:layout_width="match_parent"
-    xmlns:android="http://schemas.android.com/apk/res/android" >
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
     <android.support.v7.widget.RecyclerView
+        android:id="@+id/rvBlockchain"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/rvBlockchain">
+        android:layout_height="match_parent">
     </android.support.v7.widget.RecyclerView>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_send_transaction.xml b/app/src/main/res/layout/activity_send_transaction.xml
index f30b96bf39..0441c7ad49 100644
--- a/app/src/main/res/layout/activity_send_transaction.xml
+++ b/app/src/main/res/layout/activity_send_transaction.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.tangem.wallet.com.tangem.presentation.activity.SendTransactionActivity">
+    tools:context="com.tangem.presentation.activity.SendTransactionActivity">
 
     <ProgressBar
         android:id="@+id/progressBar"
@@ -23,7 +24,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView8" />
+        app:layout_constraintTop_toBottomOf="@+id/textView8"/>
 
     <TextView
         android:id="@+id/textView8"
@@ -42,6 +43,6 @@
         app:layout_constraintHorizontal_bias="0.507"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.378" />
+        app:layout_constraintVertical_bias="0.378"/>
 
 </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_sign_payment.xml b/app/src/main/res/layout/activity_sign_payment.xml
index 9aefb6fd12..e9654ec5d6 100644
--- a/app/src/main/res/layout/activity_sign_payment.xml
+++ b/app/src/main/res/layout/activity_sign_payment.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.tangem.wallet.com.tangem.presentation.activity.SignPaymentActivity">
+    tools:context="com.tangem.presentation.activity.SignPaymentActivity">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
         android:layout_centerVertical="true"
-        >
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/textView6"
@@ -19,7 +20,7 @@
             android:fontFamily="@font/raleway_r"
             android:text="Now touch the banknote with ID"
             android:textAlignment="center"
-            android:textSize="@dimen/font_normal" />
+            android:textSize="@dimen/font_normal"/>
 
         <TextView
             android:id="@+id/tvCardID"
@@ -31,7 +32,7 @@
             android:text="           "
             android:textAlignment="center"
             android:textColor="@color/black"
-            android:textSize="@dimen/font_large" />
+            android:textSize="@dimen/font_large"/>
 
         <TextView
             android:id="@+id/textView7"
@@ -40,7 +41,7 @@
             android:fontFamily="@font/raleway_r"
             android:text="to sign the payment"
             android:textAlignment="center"
-            android:textSize="@dimen/font_normal" />
+            android:textSize="@dimen/font_normal"/>
 
     </LinearLayout>
 
@@ -52,8 +53,6 @@
         android:layout_alignParentBottom="true"
         android:alpha="0.5"
         android:elevation="1dp"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintBottom_toBottomOf="parent"/>
 
-
-
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_swap_pin.xml b/app/src/main/res/layout/activity_swap_pin.xml
index 65bd2dc358..45d51936b1 100644
--- a/app/src/main/res/layout/activity_swap_pin.xml
+++ b/app/src/main/res/layout/activity_swap_pin.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.tangem.wallet.com.tangem.presentation.activity.PurgeActivity">
+    tools:context="com.tangem.presentation.activity.PurgeActivity">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
         android:layout_centerVertical="true"
-        >
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/textView6"
@@ -19,7 +20,7 @@
             android:fontFamily="@font/raleway_r"
             android:text="Now touch the banknote with ID"
             android:textAlignment="center"
-            android:textSize="@dimen/font_normal" />
+            android:textSize="@dimen/font_normal"/>
 
         <TextView
             android:id="@+id/tvCardID"
@@ -31,7 +32,7 @@
             android:text="           "
             android:textAlignment="center"
             android:textColor="@color/black"
-            android:textSize="@dimen/font_large" />
+            android:textSize="@dimen/font_large"/>
 
         <TextView
             android:id="@+id/textView7"
@@ -40,7 +41,7 @@
             android:fontFamily="@font/raleway_r"
             android:text="to change PIN/PIN2 codes"
             android:textAlignment="center"
-            android:textSize="@dimen/font_normal" />
+            android:textSize="@dimen/font_normal"/>
 
     </LinearLayout>
 
@@ -51,8 +52,6 @@
         android:layout_height="16dp"
         android:layout_alignParentBottom="true"
         android:elevation="1dp"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintBottom_toBottomOf="parent"/>
 
-
-
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_verify_card.xml b/app/src/main/res/layout/activity_verify_card.xml
index c46164f9a2..2f071da0b2 100644
--- a/app/src/main/res/layout/activity_verify_card.xml
+++ b/app/src/main/res/layout/activity_verify_card.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.tangem.wallet.com.tangem.presentation.activity.VerifyCardActivity">
-
+    tools:context="com.tangem.presentation.activity.VerifyCardActivity">
 
     <include
         layout="@layout/content_verify_card"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent" />
-
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bfbaf55aa5..599735ec71 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,11 +1,5 @@
 <resources>
-    <string name="app_name">Tangem Access</string>
 
-    <string name="in_msg_prefix">&lt;&#45;&#45;&#160;</string>
-    <string name="out_msg_prefix">&#45;&#45;&gt;&#160;</string>
-    <string name="okay_msg_prefix">**&#160;</string>
-    <string name="err_msg_prefix">!!&#160;</string>
-    <string name="action_msg_prefix">--&#160;</string>
     <string name="wrong_tag_err">Not ISO tag!</string>
     <string name="msgCardMustBeLoaded">Card must be loaded first!</string>
     <string name="tag_lost_err">Tag lost!</string>
@@ -19,7 +13,6 @@
     <string name="action_settings">Settings</string>
     <string name="title_activity_card_info">CardInfoActivity</string>
     <string name="section_format">Hello World from section: %1$d</string>
-
     <string name="fingerprint_authenticate_success">Successfully authenticated!</string>
     <string name="pin_save_success">Successfully saved!</string>
     <string name="prompt_pin">Enter PIN or use fingerprint scanner</string>
@@ -35,5 +28,5 @@
         <item>@string/bcEtherium</item>
     </array>
     <string name="title_activity_loaded_wallet">LoadedWalletActivity</string>
-    <string name="NoDataString">-- -- --</string>
+
 </resources>
diff --git a/app/src/main/res/values/strings_untranslatable.xml b/app/src/main/res/values/strings_untranslatable.xml
new file mode 100644
index 0000000000..c081bef888
--- /dev/null
+++ b/app/src/main/res/values/strings_untranslatable.xml
@@ -0,0 +1,10 @@
+<resources>
+
+    <string name="in_msg_prefix">&lt;&#45;&#45;&#160;</string>
+    <string name="out_msg_prefix">&#45;&#45;&gt;&#160;</string>
+    <string name="okay_msg_prefix">**&#160;</string>
+    <string name="err_msg_prefix">!!&#160;</string>
+    <string name="action_msg_prefix">--&#160;</string>
+    <string name="NoDataString">-- -- --</string>
+
+</resources>
diff --git a/app/src/release/res/values/strings.xml b/app/src/release/res/values/strings.xml
new file mode 100644
index 0000000000..7999593bc8
--- /dev/null
+++ b/app/src/release/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Tangem Access</string>
+
+</resources>
\ No newline at end of file