Fix: locking period and selected tracks (#3070)

* fix: locking period and unchange behavior * fix: selected tracks
novasamatech · Jan 30, 2025 · e45f6a4 · e45f6a4
1 parent 4674a33
commit e45f6a4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 20 deletions.
diff --git 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,

diff --git 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);