Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ export function useInitiateCounter({
);
}, [sharesRequiredToStartCounter, shareAccessKeyMapByKeyHolderId]);

console.log("------");
console.log("isTresholdReached", isTresholdReached);
console.log("sharesRequiredToStartCounter", sharesRequiredToStartCounter);
console.log("shareAccessKeyMapByKeyHolderId", shareAccessKeyMapByKeyHolderId);

const prevIsTresholdReached = usePrevious(isTresholdReached);

useEffect(() => {
Expand Down
8 changes: 8 additions & 0 deletions fe/src/stores/boxStore/joinLockedBoxStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,14 @@ export const useJoinLockedBoxStore = create<JoinLockedBoxState>()(
),
);

const shareAccessKeyByKeyHolderId = {
...state.shareAccessKeyByKeyHolderId,
};

for (const newOfflineKeyholders of newOffLineKeyHolders) {
delete shareAccessKeyByKeyHolderId[newOfflineKeyholders.id];
}

filteredPayload.onlineKeyHolders = newOnlineKeyHolders;
filteredPayload.offLineKeyHolders = newOffLineKeyHolders;
}
Expand Down
30 changes: 22 additions & 8 deletions fe/src/stores/boxStore/openLockedBoxStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,22 +180,36 @@ export const useOpenLockedBoxStore = create<OpenLockedBoxState>()(

const onlineKeyHoldersCount = newOnlineKeyHolders.length;

const shareAccessKeyByKeyHolderId = {
...state.shareAccessKeyByKeyHolderId,
};

const shareAccessKeyMapByKeyHolderId = {
...Object.fromEntries(
Object.entries(state.shareAccessKeyMapByKeyHolderId).map(
([keyHolderId, shareAccesKeyMap]) => {
delete shareAccesKeyMap[disconnectedKeyHolderId];
return [keyHolderId, shareAccesKeyMap];
},
),
),
};

delete shareAccessKeyByKeyHolderId[disconnectedKeyHolderId];
delete shareAccessKeyMapByKeyHolderId[disconnectedKeyHolderId];

const newState = {
shareAccessKeyByKeyHolderId: {
...state.shareAccessKeyByKeyHolderId,
[disconnectedKeyHolderId]: false,
},
shareAccessKeyMapByKeyHolderId: {
...state.shareAccessKeyMapByKeyHolderId,
[disconnectedKeyHolderId]: {},
},
shareAccessKeyByKeyHolderId,
shareAccessKeyMapByKeyHolderId,
onlineKeyHolders: newOnlineKeyHolders,
offLineKeyHolders: [
disconnectedKeyHolder,
...state.offLineKeyHolders,
],
};

console.log(newState);

if (
onlineKeyHoldersCount === 0 &&
state.getTopLobbyMetaStatus() !== "keyholder-able-to-unlock"
Expand Down