Merge branch 'release/1.0.8'

MyEtherWallet · Oct 29, 2019 · 1040f3c · 1040f3c
2 parents 64c7c66 + fd1acf5
commit 1040f3c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### Release 1.0.8 (19102701)
+
+- Fixed a rare crash when signing a transaction related to deploying a new smart contract
+
 ### Release 1.0.7 (19092401)
 
 - Fixed a rare case with truncated words in Backup scenario

diff --git a/app/build.gradle b/app/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'org.jetbrains.kotlin.android.extensions'
 
 int MAJOR_VERSION = 1
 int MINOR_VERSION = 0
-int MICRO_VERSION = 7
+int MICRO_VERSION = 8
 int BUILD_FOR_TODAY = 1
 
 def secretsPropertiesFile = rootProject.file("secrets.properties")

diff --git a/app/src/main/java/com/myetherwallet/mewconnect/content/data/Transaction.kt b/app/src/main/java/com/myetherwallet/mewconnect/content/data/Transaction.kt
@@ -14,7 +14,7 @@ data class Transaction(
         val nonce: BigInteger,
         val gasPrice: BigInteger,
         val gas: BigInteger,
-        val to: String,
+        val to: String?,
         val value: BigInteger,
         val data: String,
         val chainId: Long,

diff --git a/...ain/java/com/myetherwallet/mewconnect/feature/scan/fragment/ConfirmTransactionFragment.kt b/...ain/java/com/myetherwallet/mewconnect/feature/scan/fragment/ConfirmTransactionFragment.kt
@@ -67,7 +67,7 @@ class ConfirmTransactionFragment : BaseViewModelFragment(), AuthCallback {
             isUnknownToken = transactionData?.function == TransactionData.FUNCTION_TOKEN_TRANSFER
             val currency: String
             val amount: BigDecimal
-            val to: String
+            val to: String?
             if (transaction.value == BigInteger.ZERO && transactionData?.function == TransactionData.FUNCTION_TOKEN_TRANSFER) {
                 if (transaction.currency == null) {
                     amount = transactionData.amount.toBigDecimal().stripTrailingZeros()
@@ -94,7 +94,9 @@ class ConfirmTransactionFragment : BaseViewModelFragment(), AuthCallback {
                 confirm_transaction_network_container.visibility = GONE
             }
 
-            confirm_transaction_wallet_emoticon.setImageBitmap(EmoticonHelper.draw(to, resources.getDimension(R.dimen.dimen_32dp).toInt()))
+            to?.let {
+                confirm_transaction_wallet_emoticon.setImageBitmap(EmoticonHelper.draw(to, resources.getDimension(R.dimen.dimen_32dp).toInt()))
+            }
             confirm_transaction_ok.setOnClickListener {
                 val authFragment = AuthFragment.newInstance()
                 authFragment.setTargetFragment(this, AUTH_REQUEST_CODE)

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }