Revert "fix: ada issues"

This reverts commit 53221c6.
KeystoneHQ · Mar 15, 2024 · 96e93f3 · 96e93f3
1 parent b5ae839
commit 96e93f3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/app/src/main/java/com/keystone/cold/remove_wallet_mode/viewmodel/SetupVaultViewModel.java b/app/src/main/java/com/keystone/cold/remove_wallet_mode/viewmodel/SetupVaultViewModel.java
@@ -223,10 +223,10 @@ public void setupMnemonicWallet(String mnemonic) {
             if (new WriteMnemonicCallable(mnemonic, password).call()) {
                 vaultId = new GetVaultIdCallable().call();
                 mRepository.clearDb();
-                ADASetupManager adaSetupManager = ADASetupManager.getInstance();
-                if (adaSetupManager.setupADARootKey("", password)) {
-                    adaSetupManager.preSetupADAKeys(password);
-                }
+//                ADASetupManager adaSetupManager = ADASetupManager.getInstance();
+//                if (adaSetupManager.setupADARootKey("", password)) {
+//                    adaSetupManager.preSetupADAKeys(password);
+//                }
                 vaultCreateState.postValue(VAULT_STATE_CREATED);
             } else {
                 vaultCreateState.postValue(VAULT_STATE_CREATING_FAILED);
@@ -287,10 +287,10 @@ public void updatePassphrase(String passphrase) {
             if (success) {
                 vaultId = new GetVaultIdCallable().call();
                 deleteHiddenVaultData();
-                ADASetupManager adaSetupManager = ADASetupManager.getInstance();
-                if (adaSetupManager.setupADARootKey(passphrase, password)) {
-                    adaSetupManager.preSetupADAKeys(password);
-                }
+//                ADASetupManager adaSetupManager = ADASetupManager.getInstance();
+//                if (adaSetupManager.setupADARootKey(passphrase, password)) {
+//                    adaSetupManager.preSetupADAKeys(password);
+//                }
                 signature = null;
                 vaultCreateState.postValue(VAULT_STATE_CREATED);
             } else {

diff --git a/...va/com/keystone/cold/remove_wallet_mode/viewmodel/sync_viewmodel/KeyRequestViewModel.java b/...va/com/keystone/cold/remove_wallet_mode/viewmodel/sync_viewmodel/KeyRequestViewModel.java
@@ -137,8 +137,8 @@ public LiveData<UR> generateSyncUR(List<KeyRequestApproveFragment.Schema> schema
                     if (CardanoViewModel.isCardanoPath(schema.getPath())) {
                         if (password != null && !password.isEmpty()) {
                             CardanoViewModel.checkOrSetup(schema.getPath(), password, mRepository);
+                            extended_key = CardanoViewModel.getXPub(schema.getPath(), mRepository);
                         }
-                        extended_key = CardanoViewModel.getXPub(schema.getPath(), mRepository);
                     } else {
                         boolean isMainWallet = Utilities.getCurrentBelongTo(MainApplication.getApplication()).equals("main");
                         String portName = EncryptionCoreProvider.getInstance().getPortName();

diff --git a/coinlib/src/main/java/com/keystone/coinlib/utils/Coins.java b/coinlib/src/main/java/com/keystone/coinlib/utils/Coins.java
@@ -156,7 +156,7 @@ public class Coins {
             APTOS,
             SUI,
             AR,
-            ADA,
+//            ADA,
             ATOM,
             OSMO,
             SCRT,