Merge pull request #744 from KeystoneHQ/feat/import_wallet_refactor

Feat/import wallet refactor
KeystoneHQ · Apr 5, 2024 · a75570c · a75570c
2 parents 4049bf8 + 1631eb6
commit a75570c
Show file tree

Hide file tree

Showing 32 changed files with 1,119 additions and 964 deletions.
diff --git a/rust/apps/aptos/Cargo.lock b/rust/apps/aptos/Cargo.lock
diff --git a/rust/apps/arweave/Cargo.lock b/rust/apps/arweave/Cargo.lock
diff --git a/rust/apps/cosmos/Cargo.lock b/rust/apps/cosmos/Cargo.lock
diff --git a/rust/apps/ethereum/Cargo.lock b/rust/apps/ethereum/Cargo.lock
diff --git a/rust/apps/near/Cargo.lock b/rust/apps/near/Cargo.lock
diff --git a/rust/apps/tron/Cargo.lock b/rust/apps/tron/Cargo.lock
diff --git a/rust/apps/utils/Cargo.lock b/rust/apps/utils/Cargo.lock
diff --git a/rust/apps/wallets/Cargo.lock b/rust/apps/wallets/Cargo.lock
diff --git a/rust/apps/xrp/Cargo.lock b/rust/apps/xrp/Cargo.lock
diff --git a/src/tasks/qrdecode_task.c b/src/tasks/qrdecode_task.c
@@ -20,6 +20,7 @@
 #include "gui_web_auth_result_widgets.h"
 #include "assert.h"
 #include "qrdecode_task.h"
+#include "gui_resolve_ur.h"
 #ifndef BTC_ONLY
 #include "gui_key_derivation_request_widgets.h"
 #endif

diff --git a/src/ui/gui_analyze/gui_resolve_ur.c b/src/ui/gui_analyze/gui_resolve_ur.c
@@ -11,7 +11,7 @@
 #ifndef BTC_ONLY
 #include "gui_key_derivation_request_widgets.h"
 #else
-#include "gui_multi_sig_import_wallet_info_widgets.h"
+#include "gui_import_multisig_wallet_info_widgets.h"
 #endif
 #include <gui_views.h>
 

diff --git a/src/ui/gui_frame/gui_framework.c b/src/ui/gui_frame/gui_framework.c
@@ -74,9 +74,9 @@ static GUI_VIEW *g_viewsTable[] = {
     &g_transactionSignatureView,
     &g_diceRollsView,
 #ifdef BTC_ONLY
-    &g_multisigImportWalletInfoView,
-    &g_multisigImportWalletSuccessView,
-    &g_createMultiView
+    &g_importMultisigWalletInfoView,
+    &g_importMultisigWalletView,
+    &g_createMultisigWalletView
 #endif
 };