diff --git a/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt b/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt index 7e26ac59ae..3fa306f8c0 100644 --- a/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt @@ -417,6 +417,7 @@ class VerifyCardFragment : BaseFragment(), NavigationResultListener, NfcAdapter. requestPIN2Count = 0 val engine = CoinEngineFactory.create(ctx) ?: return if (!engine.hasBalanceInfo()) { + Toast.makeText(context, R.string.general_error_cannot_erase_wallet_with_non_zero_balance, Toast.LENGTH_LONG).show() return } if (engine.isBalanceNotZero) { diff --git a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/dto/PersonalizationJson.kt b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/dto/PersonalizationJson.kt index 58831014a8..a024383090 100644 --- a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/dto/PersonalizationJson.kt +++ b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/dto/PersonalizationJson.kt @@ -65,6 +65,16 @@ class PersonalizationJson { val builder = GsonBuilder().setPrettyPrinting() return builder.create() } + + fun clarifyJson(json: String): String { + val unsupportedQuotes = mutableListOf("“", "”", "«", "»") + var clearedJson = json + unsupportedQuotes.forEach { + if (clearedJson.contains(it)) clearedJson = clearedJson.replace(it, "\"") + } + // 160 is 00A0 symbol (No-Break Space) + return clearedJson.replace(160.toChar().toString(), "").trim() + } } } diff --git a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/ui/PersonalizationFragment.kt b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/ui/PersonalizationFragment.kt index bb5b708b86..9e2d3ad01a 100644 --- a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/ui/PersonalizationFragment.kt +++ b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/ui/PersonalizationFragment.kt @@ -148,7 +148,7 @@ class PersonalizationFragment : BaseCardActionFragment(), PersonalizationPresetV val tvJsonImport = parent.findViewById(R.id.et_json_import) val btnImportJson = parent.findViewById