Skip to content

Commit

Permalink
Merge branch 'whitelist_players' of https://github.com/1Hive/quests i…
Browse files Browse the repository at this point in the history
…nto whitelist_players
  • Loading branch information
Corantin committed Aug 27, 2023
2 parents fa0071c + 0c817d3 commit 5a37f6e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable no-nested-ternary */
import { Button, IconPlus, IconCross, IconGroup } from '@1hive/1hive-ui';
import { Button, IconPlus, IconCross, IconGroup, IconCheck } from '@1hive/1hive-ui';
import { noop, uniqueId } from 'lodash-es';
import { useMemo, useState } from 'react';

Expand Down Expand Up @@ -50,6 +50,8 @@ const PlayerWrapperStyled = styled.div`

const AddWrapperStyled = styled.div`
display: flex;
justify-content: space-between;
padding-top: ${GUpx(1)};
`;

// #endregion
Expand Down Expand Up @@ -176,9 +178,9 @@ export default function PlayerListModal({
<AddWrapperStyled>
<Button icon={<IconPlus />} label="Add" onClick={() => addPlayerToWhitelist()} />
<Button
icon={<IconPlus />}
icon={<IconCheck />}
label="Confirm list"
mode="strong"
mode="positive"
onClick={() => onWhitelistSubmit()}
/>
</AddWrapperStyled>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-app/src/components/quest.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ export default function Quest({
if (!depositReleased && questData.createDeposit) {
depositLocked.push(questData.createDeposit);
}
if (players.length && questData.playDeposit && !questData.isWhitelist) {
if (players.length && questData.playDeposit && questData.isWhitelist) {
// Multiply by the number of players (each one has a deposit locked)
questData.playDeposit.amount = questData.playDeposit.amount.mul(players.length);
depositLocked.push(questData.playDeposit);
Expand Down

0 comments on commit 5a37f6e

Please sign in to comment.