diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 41bd63e5f0..cab85c1c8a 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index d1a978f7ce..b612ab5387 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,7 +23,7 @@ android { debug { debuggable true minifyEnabled false -// applicationIdSuffix ".debug" + applicationIdSuffix ".debug" signingConfig signingConfigs.debug } } diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml index 3012451cdf..fe9a69b384 100644 --- a/app/src/debug/res/values/strings.xml +++ b/app/src/debug/res/values/strings.xml @@ -1,6 +1,6 @@ - Tangem Access DEV + DEV \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a0ab6bb5f6..31a6251038 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,7 +32,7 @@ @@ -43,7 +43,7 @@ @@ -66,7 +66,7 @@ + \ No newline at end of file diff --git a/app/src/main/java/com/tangem/domain/wallet/TangemCard.java b/app/src/main/java/com/tangem/domain/wallet/TangemCard.java index ce42be9a10..d3b59b8f1b 100644 --- a/app/src/main/java/com/tangem/domain/wallet/TangemCard.java +++ b/app/src/main/java/com/tangem/domain/wallet/TangemCard.java @@ -327,7 +327,7 @@ public class TangemCard { // } // } } else { - result.append("None"); + result.append("-- -- --"); } } else { result.append("-- -- --"); @@ -405,7 +405,7 @@ public class TangemCard { result.append("\nawaiting confirmation..."); } } else if (balanceUnconfirmed == 0) { - result.append("None"); + result.append("-- -- --"); } else if (balanceUnconfirmed != 0) { result.append("awaiting confirmation..."); } @@ -432,7 +432,7 @@ public class TangemCard { if (hasUnspentInfo() && hasHistoryInfo() && mHistoryTransactions.size() - mUnspentTransactions.size() > 0) { return String.valueOf(mHistoryTransactions.size() - mUnspentTransactions.size()); } else if (hasUnspentInfo() && hasHistoryInfo()) { - return "None"; + return "-- -- --"; } else { return "-- -- --"; } @@ -476,7 +476,7 @@ public class TangemCard { if (balanceUnconfirmed != 0) { return "awaiting confirmation..."; } else { - return "None"; + return "-- -- --"; } } } @@ -505,13 +505,13 @@ public class TangemCard { } if (maxUDT == 0) { - return "None"; + return "-- -- --"; } else { return Util.formatDateTime(new Date(maxUDT)); } } else { - return "None"; + return "-- -- --"; } } else { return "-- -- --"; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6799862075..b68c06cb89 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -10,7 +10,6 @@ This app is useless when NFC is disabled. Reader mode depends on it. Hit OK to go to Settings, where you can enable NFC. command response - Tangem Access Settings CardInfoActivity Hello World from section: %1$d