Potential bug fix for TFrameAccountExplorer

To be tested in TestGUIImprovements

Author: SkybuckFlying

src/gui-classic/Frames/UFrameAccountExplorer.pas

@@ -90,17 +90,19 @@   TFrameAccountExplorer = class(TFrame)
 
     function DoUpdateAccountsFilter: Boolean;
 
-    procedure OnAccountsGridUpdatedData(Sender : TObject);
-    Procedure OnSelectedAccountsGridUpdated(Sender : TObject);
 
   public
     { Public declarations }
 
     procedure UpdateAccounts(RefreshData : Boolean);
     procedure UpdatePrivateKeys;
 
-    property AccountsGrid : TAccountsGrid read FAccountsGrid;
-    property SelectedAccountsGrid : TAccountsGrid read FSelectedAccountsGrid;
+    procedure OnAccountsGridUpdatedData(Sender : TObject);
+    Procedure OnSelectedAccountsGridUpdated(Sender : TObject);
+
+
+    property AccountsGrid : TAccountsGrid read FAccountsGrid write FAccountsGrid;
+    property SelectedAccountsGrid : TAccountsGrid read FSelectedAccountsGrid write FSelectedAccountsGrid;
 
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -141,18 +143,6 @@ constructor TFrameAccountExplorer.Create(AOwner: TComponent);
 
   FLastAccountsGridInvalidateTC := TPlatform.GetTickCount;
 
-  FAccountsGrid := TAccountsGrid.Create(Self);
-  FAccountsGrid.DrawGrid := dgAccounts;
-  FAccountsGrid.AllowMultiSelect := True;
-  FAccountsGrid.OnAccountsGridUpdatedData := OnAccountsGridUpdatedData;
-  FAccountsGrid.AccountsGridDatasource := acds_Node;
-
-  FSelectedAccountsGrid := TAccountsGrid.Create(Self);
-  FSelectedAccountsGrid.AccountsGridDatasource := acds_InternalList;
-  FSelectedAccountsGrid.DrawGrid := dgSelectedAccounts;
-  FSelectedAccountsGrid.OnUpdated := OnSelectedAccountsGridUpdated;
-
-
 
   // cannot set properties here that interact with FRMWallet because
   // FRMWallet not yet created.

src/gui-classic/UFRMWallet.pas

@@ -139,6 +139,8 @@   TFRMWallet = class(TForm)
     FWalletKeys : TWalletKeysExt;
     FLog : TLog;
     FNodeNotifyEvents : TNodeNotifyEvents;
+    FAccountsGrid : TAccountsGrid;
+    FSelectedAccountsGrid : TAccountsGrid;
     FOperationsAccountGrid : TOperationsGrid;
     FPendingOperationsGrid : TOperationsGrid;
     FOperationsExplorerGrid : TOperationsGrid;
@@ -469,6 +471,19 @@ procedure TFRMWallet.FormCreate(Sender: TObject);
   FNodeNotifyEvents.OnNodeMessageEvent := FrameMessages.OnNodeMessageEvent;
   FNodeNotifyEvents.OnKeyActivity := OnNodeKeysActivity;
 
+  FAccountsGrid := TAccountsGrid.Create(Self);
+  FAccountsGrid.DrawGrid := FrameAccountExplorer.dgAccounts;
+  FAccountsGrid.AllowMultiSelect := True;
+  FAccountsGrid.OnAccountsGridUpdatedData := FrameAccountExplorer.OnAccountsGridUpdatedData;
+  FAccountsGrid.AccountsGridDatasource := acds_Node;
+  FrameAccountExplorer.AccountsGrid := FAccountsGrid;
+
+  FSelectedAccountsGrid := TAccountsGrid.Create(Self);
+  FSelectedAccountsGrid.AccountsGridDatasource := acds_InternalList;
+  FSelectedAccountsGrid.DrawGrid := FrameAccountExplorer.dgSelectedAccounts;
+  FSelectedAccountsGrid.OnUpdated := FrameAccountExplorer.OnSelectedAccountsGridUpdated;
+  FrameAccountExplorer.SelectedAccountsGrid := FSelectedAccountsGrid;
+
   FOperationsAccountGrid := TOperationsGrid.Create(Self);
   FOperationsAccountGrid.DrawGrid := FrameAccountExplorer.dgAccountOperations;
   FOperationsAccountGrid.MustShowAlwaysAnAccount := true;