From 8702768c33f95fb1973165c0bff509b3d6c82c9e Mon Sep 17 00:00:00 2001
From: asmadek <alma2610@ya.ru>
Date: Thu, 30 Jan 2025 16:41:04 +0500
Subject: [PATCH 1/2] fix: locking period and unchange behavior

---
 .../EditDelegationModal/model/form-model.ts   | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/renderer/widgets/EditDelegationModal/model/form-model.ts b/src/renderer/widgets/EditDelegationModal/model/form-model.ts
index 824a51e9ba..5213da4226 100644
--- a/src/renderer/widgets/EditDelegationModal/model/form-model.ts
+++ b/src/renderer/widgets/EditDelegationModal/model/form-model.ts
@@ -349,9 +349,12 @@ sample({
   fn: (network, { activeDelegations, shards }) => {
     const address = toAddress(shards[0].accountId, { prefix: network!.chain.addressPrefix });
 
-    return activeDelegations[address].conviction;
+    return { conviction: activeDelegations[address].conviction, isUnchanged: shards.length > 0 };
   },
-  target: $delegateForm.fields.conviction.onChange,
+  target: spread({
+    conviction: $delegateForm.fields.conviction.onChange,
+    isUnchanged: $delegateForm.fields.isUnchanged.onChange,
+  }),
 });
 
 sample({
@@ -376,20 +379,6 @@ sample({
   target: $delegateForm.fields.amount.onChange,
 });
 
-sample({
-  clock: formInitiated,
-  filter: ({ shards }) => Object.keys(shards).length > 1,
-  fn: () => true,
-  target: $delegateForm.fields.isUnchanged.onChange,
-});
-
-sample({
-  clock: $delegateForm.fields.isUnchanged.onChange,
-  filter: Boolean,
-  fn: (): Conviction => 'None',
-  target: $delegateForm.fields.conviction.onChange,
-});
-
 sample({
   clock: formInitiated,
   source: $networkStore,

From 0e88231ad4ad1d1dc5881c4698262c584335c04f Mon Sep 17 00:00:00 2001
From: asmadek <alma2610@ya.ru>
Date: Thu, 30 Jan 2025 16:44:58 +0500
Subject: [PATCH 2/2] fix: selected tracks

---
 .../EditDelegationModal/model/select-tracks-model.ts      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/renderer/widgets/EditDelegationModal/model/select-tracks-model.ts b/src/renderer/widgets/EditDelegationModal/model/select-tracks-model.ts
index b029699d93..b82b9c32a1 100644
--- a/src/renderer/widgets/EditDelegationModal/model/select-tracks-model.ts
+++ b/src/renderer/widgets/EditDelegationModal/model/select-tracks-model.ts
@@ -38,10 +38,10 @@ const $votedTracks = createStore<string[]>([]).reset(formInitiated);
 const $delegatedTracks = createStore<string[]>([]).reset(formInitiated);
 const $votesToRemove = createStore<VotesToRemove[]>([]).reset(formInitiated);
 
-const $accounts = createStore<Account[]>([]);
-const $availableAccounts = createStore<Account[]>([]);
-const $delegate = createStore<DelegateAccount | null>(null);
-const $isMaxWeightReached = createStore(false);
+const $accounts = createStore<Account[]>([]).reset(formInitiated);
+const $availableAccounts = createStore<Account[]>([]).reset(formInitiated);
+const $delegate = createStore<DelegateAccount | null>(null).reset(formInitiated);
+const $isMaxWeightReached = createStore(false).reset(formInitiated);
 
 const $availableTracks = combine(tracksAggregate.$tracks, (tracks) => {
   return Object.keys(tracks);