Skip to content

Commit

Permalink
fix: fellowship small issues (#2812)
Browse files Browse the repository at this point in the history
  • Loading branch information
johnthecat authored Dec 9, 2024
1 parent 2e00b26 commit 0b5a863
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 10 deletions.
4 changes: 4 additions & 0 deletions src/renderer/domains/collectives/model/tracks/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ const getMinimumRank = (trackId: TrackId, maxRank: number) => {
return trackId - 18;
}

if (trackId >= 31 && trackId <= 36) {
return trackId - 28;
}

return maxRank;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ export const ProfileCard = memo(() => {
{member ? (
<Box direction="row" width="100%" gap={2} verticalAlign="center">
<SmallTitleText className="w-full">
{identity?.name ?? (
<Address
showIcon
iconSize={16}
address={toAddress(member.accountId, { prefix: featureInput?.chain.addressPrefix })}
variant="truncate"
/>
)}
<Address
showIcon
iconSize={16}
title={identity?.name}
address={toAddress(member.accountId, { prefix: featureInput?.chain.addressPrefix })}
hideAddress
variant="truncate"
/>
</SmallTitleText>
</Box>
) : (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const WalletVotingInfo = memo(({ referendumId }: Props) => {

return (
<Surface>
<Box padding={6} gap={1}>
<Box direction="row" padding={6} gap={1}>
<Icon name="voted" size={16} className="text-icon-accent" />
<span className="text-footnote text-tab-text-accent">{t('fellowship.voting.voted')}</span>
<span className="text-footnote">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export const WalletConnect = ({ apis, signingPayloads, validateBalance, onGoBack
}, [countdown]);

useEffect(() => {
if (signatures) {
if (signatures.length > 0) {
handleSignature(signatures);
}
}, [signatures]);
Expand Down
8 changes: 8 additions & 0 deletions src/renderer/shared/transactions/createFeeCalculator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,13 @@ export const createFeeCalculator = ({ $transaction, $api }: Params) => {
target: $fee,
});

sample({
clock: fetchFeeFx.fail,
source: $transaction,
filter: nonNullable,
fn: (_) => BN_ZERO,
target: $fee,
});

return { $: $fee, $pending: fetchFeeFx.pending };
};

0 comments on commit 0b5a863

Please sign in to comment.