Release fixes (#1886)

* Fix ens resolution for minified builds * Handle #1885 * Remove scroll flags on key export page
safe-global · Jan 10, 2023 · b2af7cb · b2af7cb
1 parent 15260a3
commit b2af7cb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -22,9 +22,9 @@ android {
         buildConfigField javaTypes.STRING, "INTERCOM_APP_ID", asString(getKey("INTERCOM_APP_ID", ""))
         buildConfigField javaTypes.STRING, "INTERCOM_API_KEY", asString(getKey("INTERCOM_API_KEY", ""))
         // Services
-        buildConfigField javaTypes.STRING, "BLOCKCHAIN_NET_URL", asString(getKey("BLOCKCHAIN_NET_URL", "https://rinkeby.infura.io/v3/"))
+        buildConfigField javaTypes.STRING, "BLOCKCHAIN_NET_URL", asString(getKey("BLOCKCHAIN_NET_URL", "https://goerli.infura.io/v3/"))
         // Blockchain settings
-        buildConfigField javaTypes.STRING, "BLOCKCHAIN_NAME", asString(getKey("BLOCKCHAIN_NAME", "Rinkeby"))
+        buildConfigField javaTypes.STRING, "BLOCKCHAIN_NAME", asString(getKey("BLOCKCHAIN_NAME", "Goerli"))
         // Certificates
         buildConfigField javaTypes.MAP, "SSL_PINS", getKey("SSL_PINS",
                 "new ${javaTypes.MAP}()" +

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -73,6 +73,9 @@
 -keep @interface pm.gnosis.heimdall.data.adapters.DecimalNumber
 -keep @interface pm.gnosis.heimdall.data.adapters.BigDecimalNumber
 
+-keep interface pm.gnosis.ethereum.rpc.models.** { *; }
+-keep class pm.gnosis.ethereum.rpc.models.** { *; }
+
 -keep interface io.gnosis.data.models.** { *; }
 -keep class io.gnosis.data.models.** { *; }
 

diff --git a/app/src/main/java/io/gnosis/safe/ui/assets/AssetsViewModel.kt b/app/src/main/java/io/gnosis/safe/ui/assets/AssetsViewModel.kt
@@ -4,7 +4,6 @@ import io.gnosis.data.models.Safe
 import io.gnosis.data.repositories.SafeRepository
 import io.gnosis.safe.ui.base.AppDispatchers
 import io.gnosis.safe.ui.base.BaseStateViewModel
-import kotlinx.coroutines.flow.collect
 import javax.inject.Inject
 
 class AssetsViewModel @Inject constructor(
@@ -33,6 +32,9 @@ class AssetsViewModel @Inject constructor(
             updateState {
                 SafeBalancesState.TotalBalance(balance, null)
             }
+            updateState {
+                SafeBalancesState.ActiveSafe(activeSafe, null)
+            }
         }
     }
 }

diff --git a/app/src/main/java/io/gnosis/safe/ui/assets/coins/CoinsFragment.kt b/app/src/main/java/io/gnosis/safe/ui/assets/coins/CoinsFragment.kt
@@ -61,7 +61,7 @@ class CoinsFragment : BaseViewBindingFragment<FragmentCoinsBinding>() {
             coins.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
             refresh.setOnRefreshListener { viewModel.load(true) }
         }
-        viewModel.state.observe(viewLifecycleOwner, Observer { state ->
+        viewModel.state.observe(viewLifecycleOwner) { state ->
             when (state) {
                 is CoinsState -> {
                     binding.progress.visible(state.loading)
@@ -97,7 +97,7 @@ class CoinsFragment : BaseViewBindingFragment<FragmentCoinsBinding>() {
                     }
                 }
             }
-        })
+        }
     }
 
     override fun onResume() {

diff --git a/app/src/main/res/layout/fragment_owner_export.xml b/app/src/main/res/layout/fragment_owner_export.xml
@@ -21,8 +21,7 @@
             android:orientation="horizontal"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_scrollFlags="scroll|enterAlways">
+            app:layout_constraintTop_toTopOf="parent">
 
             <ImageButton
                 android:id="@+id/back_button"