feat: view claims screen improvements

src/ui/components/tokens_subscreen_chooser_panel.rs

@@ -52,17 +52,19 @@ pub fn add_tokens_subscreen_chooser_panel(ctx: &Context, app_context: &AppContex
                         // Handle navigation based on which subscreen is selected
                         match subscreen {
                             TokensSubscreen::MyTokens => {
-                                action = AppAction::SetMainScreen(
+                                action = AppAction::SetMainScreenThenGoToMainScreen(
                                     RootScreenType::RootScreenMyTokenBalances,
                                 )
                             }
                             TokensSubscreen::SearchTokens => {
-                                action =
-                                    AppAction::SetMainScreen(RootScreenType::RootScreenTokenSearch)
+                                action = AppAction::SetMainScreenThenGoToMainScreen(
+                                    RootScreenType::RootScreenTokenSearch,
+                                )
                             }
                             TokensSubscreen::TokenCreator => {
-                                action =
-                                    AppAction::SetMainScreen(RootScreenType::RootScreenTokenCreator)
+                                action = AppAction::SetMainScreenThenGoToMainScreen(
+                                    RootScreenType::RootScreenTokenCreator,
+                                )
                             }
                         }
                     }

src/ui/tokens/add_token_by_id_screen.rs

@@ -12,6 +12,8 @@ use eframe::egui::{self, Color32, Context, RichText, Ui};
 use crate::backend_task::contract::ContractTask;
 use crate::backend_task::BackendTaskSuccessResult;
 use crate::database::contracts::InsertTokensToo;
+use crate::ui::components::left_panel::add_left_panel;
+use crate::ui::components::tokens_subscreen_chooser_panel::add_tokens_subscreen_chooser_panel;
 use crate::ui::tokens::tokens_screen::TokenInfo;
 use crate::{
     app::AppAction,
@@ -217,6 +219,16 @@ impl ScreenLike for AddTokenByIdScreen {
             vec![],
         );
 
+        // Left panel
+        action |= add_left_panel(
+            ctx,
+            &self.app_context,
+            crate::ui::RootScreenType::RootScreenMyTokenBalances,
+        );
+
+        // Subscreen chooser
+        action |= add_tokens_subscreen_chooser_panel(ctx, &self.app_context);
+
         egui::CentralPanel::default().show(ctx, |ui| {
             ui.heading("Add Token");
             ui.add_space(10.0);

src/ui/tokens/burn_tokens_screen.rs

@@ -7,6 +7,8 @@ use dash_sdk::dpp::platform_value::string_encoding::Encoding;
 use eframe::egui::{self, Color32, Context, Ui};
 use egui::RichText;
 
+use crate::ui::components::left_panel::add_left_panel;
+use crate::ui::components::tokens_subscreen_chooser_panel::add_tokens_subscreen_chooser_panel;
 use dash_sdk::dpp::identity::accessors::IdentityGettersV0;
 use dash_sdk::dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0;
 use dash_sdk::dpp::identity::{KeyType, Purpose, SecurityLevel};
@@ -280,6 +282,16 @@ impl ScreenLike for BurnTokensScreen {
             vec![],
         );
 
+        // Left panel
+        action |= add_left_panel(
+            ctx,
+            &self.app_context,
+            crate::ui::RootScreenType::RootScreenMyTokenBalances,
+        );
+
+        // Subscreen chooser
+        action |= add_tokens_subscreen_chooser_panel(ctx, &self.app_context);
+
         egui::CentralPanel::default().show(ctx, |ui| {
             // If we are in the "Complete" status, just show success screen
             if self.status == BurnTokensStatus::Complete {

src/ui/tokens/claim_tokens_screen.rs

@@ -1,3 +1,5 @@
+use crate::ui::components::left_panel::add_left_panel;
+use crate::ui::components::tokens_subscreen_chooser_panel::add_tokens_subscreen_chooser_panel;
 use std::collections::HashSet;
 use std::sync::{Arc, RwLock};
 use std::time::{SystemTime, UNIX_EPOCH};
@@ -315,6 +317,16 @@ impl ScreenLike for ClaimTokensScreen {
             vec![],
         );
 
+        // Left panel
+        action |= add_left_panel(
+            ctx,
+            &self.app_context,
+            crate::ui::RootScreenType::RootScreenMyTokenBalances,
+        );
+
+        // Subscreen chooser
+        action |= add_tokens_subscreen_chooser_panel(ctx, &self.app_context);
+
         egui::CentralPanel::default().show(ctx, |ui| {
             if self.status == ClaimTokensStatus::Complete {
                 action = self.show_success_screen(ui);

src/ui/tokens/destroy_frozen_funds_screen.rs

@@ -7,6 +7,8 @@ use dash_sdk::dpp::platform_value::string_encoding::Encoding;
 use eframe::egui::{self, Color32, Context, Ui};
 use egui::RichText;
 
+use crate::ui::components::left_panel::add_left_panel;
+use crate::ui::components::tokens_subscreen_chooser_panel::add_tokens_subscreen_chooser_panel;
 use dash_sdk::dpp::identity::accessors::IdentityGettersV0;
 use dash_sdk::dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0;
 use dash_sdk::dpp::identity::{KeyType, Purpose, SecurityLevel};
@@ -299,6 +301,16 @@ impl ScreenLike for DestroyFrozenFundsScreen {
             vec![],
         );
 
+        // Left panel
+        action |= add_left_panel(
+            ctx,
+            &self.app_context,
+            crate::ui::RootScreenType::RootScreenMyTokenBalances,
+        );
+
+        // Subscreen chooser
+        action |= add_tokens_subscreen_chooser_panel(ctx, &self.app_context);
+
         egui::CentralPanel::default().show(ctx, |ui| {
             if self.status == DestroyFrozenFundsStatus::Complete {
                 action = self.show_success_screen(ui);

src/ui/tokens/freeze_tokens_screen.rs

@@ -18,6 +18,8 @@ use crate::backend_task::BackendTask;
 use crate::context::AppContext;
 use crate::model::qualified_identity::QualifiedIdentity;
 use crate::model::wallet::Wallet;
+use crate::ui::components::left_panel::add_left_panel;
+use crate::ui::components::tokens_subscreen_chooser_panel::add_tokens_subscreen_chooser_panel;
 use crate::ui::components::top_panel::add_top_panel;
 use crate::ui::components::wallet_unlock::ScreenWithWalletUnlock;
 use crate::ui::identities::get_selected_wallet;
@@ -277,6 +279,16 @@ impl ScreenLike for FreezeTokensScreen {
             vec![],
         );
 
+        // Left panel
+        action |= add_left_panel(
+            ctx,
+            &self.app_context,
+            crate::ui::RootScreenType::RootScreenMyTokenBalances,
+        );
+
+        // Subscreen chooser
+        action |= add_tokens_subscreen_chooser_panel(ctx, &self.app_context);
+
         egui::CentralPanel::default().show(ctx, |ui| {
             if self.status == FreezeTokensStatus::Complete {
                 action = self.show_success_screen(ui);

src/ui/tokens/mint_tokens_screen.rs

@@ -19,6 +19,8 @@ use crate::backend_task::BackendTask;
 use crate::context::AppContext;
 use crate::model::qualified_identity::QualifiedIdentity;
 use crate::model::wallet::Wallet;
+use crate::ui::components::left_panel::add_left_panel;
+use crate::ui::components::tokens_subscreen_chooser_panel::add_tokens_subscreen_chooser_panel;
 use crate::ui::components::top_panel::add_top_panel;
 use crate::ui::components::wallet_unlock::ScreenWithWalletUnlock;
 use crate::ui::identities::get_selected_wallet;
@@ -325,6 +327,16 @@ impl ScreenLike for MintTokensScreen {
             vec![],
         );
 
+        // Left panel
+        action |= add_left_panel(
+            ctx,
+            &self.app_context,
+            crate::ui::RootScreenType::RootScreenMyTokenBalances,
+        );
+
+        // Subscreen chooser
+        action |= add_tokens_subscreen_chooser_panel(ctx, &self.app_context);
+
         egui::CentralPanel::default().show(ctx, |ui| {
             // If we are in the "Complete" status, just show success screen
             if self.status == MintTokensStatus::Complete {

src/ui/tokens/pause_tokens_screen.rs

@@ -17,6 +17,8 @@ use crate::backend_task::BackendTask;
 use crate::context::AppContext;
 use crate::model::qualified_identity::QualifiedIdentity;
 use crate::model::wallet::Wallet;
+use crate::ui::components::left_panel::add_left_panel;
+use crate::ui::components::tokens_subscreen_chooser_panel::add_tokens_subscreen_chooser_panel;
 use crate::ui::components::top_panel::add_top_panel;
 use crate::ui::components::wallet_unlock::ScreenWithWalletUnlock;
 use crate::ui::identities::get_selected_wallet;
@@ -241,6 +243,16 @@ impl ScreenLike for PauseTokensScreen {
             vec![],
         );
 
+        // Left panel
+        action |= add_left_panel(
+            ctx,
+            &self.app_context,
+            crate::ui::RootScreenType::RootScreenMyTokenBalances,
+        );
+
+        // Subscreen chooser
+        action |= add_tokens_subscreen_chooser_panel(ctx, &self.app_context);
+
         egui::CentralPanel::default().show(ctx, |ui| {
             if self.status == PauseTokensStatus::Complete {
                 action = self.show_success_screen(ui);

src/ui/tokens/resume_tokens_screen.rs

@@ -17,6 +17,8 @@ use crate::backend_task::BackendTask;
 use crate::context::AppContext;
 use crate::model::qualified_identity::QualifiedIdentity;
 use crate::model::wallet::Wallet;
+use crate::ui::components::left_panel::add_left_panel;
+use crate::ui::components::tokens_subscreen_chooser_panel::add_tokens_subscreen_chooser_panel;
 use crate::ui::components::top_panel::add_top_panel;
 use crate::ui::components::wallet_unlock::ScreenWithWalletUnlock;
 use crate::ui::identities::get_selected_wallet;
@@ -237,6 +239,16 @@ impl ScreenLike for ResumeTokensScreen {
             vec![],
         );
 
+        // Left panel
+        action |= add_left_panel(
+            ctx,
+            &self.app_context,
+            crate::ui::RootScreenType::RootScreenMyTokenBalances,
+        );
+
+        // Subscreen chooser
+        action |= add_tokens_subscreen_chooser_panel(ctx, &self.app_context);
+
         egui::CentralPanel::default().show(ctx, |ui| {
             if self.status == ResumeTokensStatus::Complete {
                 action = self.show_success_screen(ui);

src/ui/tokens/transfer_tokens_screen.rs

@@ -4,6 +4,8 @@ use crate::backend_task::BackendTask;
 use crate::context::AppContext;
 use crate::model::qualified_identity::QualifiedIdentity;
 use crate::model::wallet::Wallet;
+use crate::ui::components::left_panel::add_left_panel;
+use crate::ui::components::tokens_subscreen_chooser_panel::add_tokens_subscreen_chooser_panel;
 use crate::ui::components::top_panel::add_top_panel;
 use crate::ui::identities::keys::add_key_screen::AddKeyScreen;
 use crate::ui::identities::keys::key_info_screen::KeyInfoScreen;
@@ -321,6 +323,16 @@ impl ScreenLike for TransferTokensScreen {
             vec![],
         );
 
+        // Left panel
+        action |= add_left_panel(
+            ctx,
+            &self.app_context,
+            crate::ui::RootScreenType::RootScreenMyTokenBalances,
+        );
+
+        // Subscreen chooser
+        action |= add_tokens_subscreen_chooser_panel(ctx, &self.app_context);
+
         egui::CentralPanel::default().show(ctx, |ui| {
             // Show the success screen if the transfer was successful
             if self.transfer_tokens_status == TransferTokensStatus::Complete {

src/ui/tokens/unfreeze_tokens_screen.rs

@@ -18,6 +18,8 @@ use crate::backend_task::BackendTask;
 use crate::context::AppContext;
 use crate::model::qualified_identity::QualifiedIdentity;
 use crate::model::wallet::Wallet;
+use crate::ui::components::left_panel::add_left_panel;
+use crate::ui::components::tokens_subscreen_chooser_panel::add_tokens_subscreen_chooser_panel;
 use crate::ui::components::top_panel::add_top_panel;
 use crate::ui::components::wallet_unlock::ScreenWithWalletUnlock;
 use crate::ui::identities::get_selected_wallet;
@@ -273,6 +275,16 @@ impl ScreenLike for UnfreezeTokensScreen {
             vec![],
         );
 
+        // Left panel
+        action |= add_left_panel(
+            ctx,
+            &self.app_context,
+            crate::ui::RootScreenType::RootScreenMyTokenBalances,
+        );
+
+        // Subscreen chooser
+        action |= add_tokens_subscreen_chooser_panel(ctx, &self.app_context);
+
         egui::CentralPanel::default().show(ctx, |ui| {
             if self.status == UnfreezeTokensStatus::Complete {
                 action = self.show_success_screen(ui);