Merge pull request #422 from KeystoneHQ/rwm-fix

fix(rwm): import wallet navigation issue
KeystoneHQ · Mar 15, 2023 · 9f74abc · 9f74abc
2 parents 48d8e02 + da9749f
commit 9f74abc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/app/src/main/assets/coin/config.json b/app/src/main/assets/coin/config.json
@@ -128,7 +128,7 @@
     "MATIC",
     "DOT",
     "LTC",
-    "OKB",
+    "OKT",
     "SOL",
     "TRX",
     "AVAX",

diff --git a/app/src/main/java/com/keystone/cold/remove_wallet_mode/helper/CoinConfigHelper.java b/app/src/main/java/com/keystone/cold/remove_wallet_mode/helper/CoinConfigHelper.java
@@ -56,6 +56,7 @@ public static void initCoinConfig() {
         try {
             JSONObject coinConfig = new JSONObject(ScriptLoader.readAsset("coin/config.json"));
             int version = coinConfig.getInt("version");
+            //TODO load local config when version upgrade
             SharePreferencesUtil.setCoinConfig(MainApplication.getApplication(),
                     mapToLocalConfig(coinConfig.getJSONArray("extraCoins")));
             SharePreferencesUtil.setCoinConfigVersion(MainApplication.getApplication(), version);

diff --git a/...in/java/com/keystone/cold/remove_wallet_mode/ui/fragment/setup/MnemonicInputFragment.java b/...in/java/com/keystone/cold/remove_wallet_mode/ui/fragment/setup/MnemonicInputFragment.java
@@ -27,6 +27,7 @@
 import static com.keystone.cold.viewmodel.SetupVaultViewModel.VAULT_STATE_CREATING_FAILED;
 import static com.keystone.cold.viewmodel.SetupVaultViewModel.VAULT_STATE_NOT_CREATE;
 
+import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
@@ -52,6 +53,7 @@
 import com.keystone.cold.databinding.CreateVaultModalBinding;
 import com.keystone.cold.databinding.MnemonicInputFragmentBinding;
 import com.keystone.cold.databinding.ModalWithTwoButtonBinding;
+import com.keystone.cold.remove_wallet_mode.ui.MainActivity;
 import com.keystone.cold.remove_wallet_mode.ui.SetupVaultActivity;
 import com.keystone.cold.remove_wallet_mode.ui.fragment.unlock.VerifyMnemonicFragment;
 import com.keystone.cold.remove_wallet_mode.viewmodel.SetupVaultViewModel;
@@ -291,13 +293,17 @@ void subscribeVaultState(MutableLiveData<Integer> vaultState) {
                     if (dialog != null && dialog.getDialog() != null && dialog.getDialog().isShowing()) {
                         dialog.dismiss();
                     }
-                    Bundle data = new Bundle();
+
                     boolean isSetupProcess = ((SetupVaultActivity) mActivity).inSetupProcess;
-                    data.putBoolean(IS_SETUP_VAULT, isSetupProcess);
-                    if (isSetupProcess) {
+                    if (!isSetupProcess) {
+                        startActivity(new Intent(mActivity, MainActivity.class));
+                        mActivity.finish();
+                    } else {
+                        Bundle data = new Bundle();
+                        data.putBoolean(IS_SETUP_VAULT, true);
                         viewModel.setVaultCreateStep(VAULT_CREATE_STEP_DONE);
+                        navigate(R.id.action_to_setupSelectWalletFragment, data);
                     }
-                    navigate(R.id.action_to_setupSelectWalletFragment, data);
                 };
 
                 //List<CoinEntity> coins = PresetData.generateCoins(mActivity);
-Original file line number
+Diff line change
@@ Expand Up / @@ -128,7 +128,7 @@ @@
         "MATIC",
         "DOT",
         "LTC",
-        "OKB",
+        "OKT",
         "SOL",
         "TRX",
         "AVAX",
@@ Expand Down @@