Migrate to gateway

app/src/androidTest/kotlin/wallet/android/app/tokens/TestValidateTokenAddress.kt

@@ -1,11 +1,5 @@
 package wallet.android.app.tokens
 
-import com.gemwallet.android.blockchain.clients.aptos.AptosGetTokenClient
-import com.gemwallet.android.blockchain.clients.ethereum.EvmGetTokenClient
-import com.gemwallet.android.blockchain.clients.solana.SolanaTokenClient
-import com.gemwallet.android.blockchain.clients.sui.SuiGetTokenClient
-import com.gemwallet.android.blockchain.clients.ton.TonGetTokenClient
-import com.gemwallet.android.blockchain.clients.tron.TronGetTokenClient
 import junit.framework.TestCase.assertFalse
 import junit.framework.TestCase.assertTrue
 import org.junit.Test

app/src/main/kotlin/com/gemwallet/android/data/password/PreferencePasswordStore.kt

@@ -8,6 +8,7 @@ import androidx.security.crypto.MasterKey
 import com.gemwallet.android.blockchain.operators.PasswordStore
 import com.gemwallet.android.math.toHexString
 import java.security.SecureRandom
+import androidx.core.content.edit
 
 class PreferencePasswordStore(
     private val context: Context,
@@ -18,10 +19,9 @@ class PreferencePasswordStore(
     override fun createPassword(walletId: String): String {
         val key = ByteArray(16)
         random.nextBytes(key)
-        getStore()
-            .edit()
-            .putString(walletId, key.toHexString())
-            .commit()
+        getStore().edit(commit = true) {
+            putString(walletId, key.toHexString())
+        }
         return key.toHexString()
     }