Skip to content

Commit f09b7cc

Browse files
authored
OCT-1762: UI does not show delegated state properly (#328)
2 parents ca0de93 + 7ad1de7 commit f09b7cc

File tree

2 files changed

+33
-11
lines changed

2 files changed

+33
-11
lines changed

client/src/components/Settings/SettingsUniquenessScoreAddresses/SettingsUniquenessScoreAddresses.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import { useTranslation } from 'react-i18next';
55
import { useAccount } from 'wagmi';
66

77
import Identicon from 'components/ui/Identicon';
8+
import Svg from 'components/ui/Svg';
89
import useSettingsStore from 'store/settings/store';
10+
import { octant } from 'svg/logo';
911
import truncateEthAddress from 'utils/truncateEthAddress';
1012

1113
import styles from './SettingsUniquenessScoreAddresses.module.scss';
@@ -34,7 +36,8 @@ const SettingsUniquenessScoreAddresses: FC<SettingsUniquenessScoreAddressesProps
3436
}));
3537

3638
const addresses =
37-
isDelegationCompleted && delegationPrimaryAddress && delegationSecondaryAddress
39+
(isDelegationCompleted && delegationPrimaryAddress && delegationSecondaryAddress) ||
40+
(delegationPrimaryAddress && delegationSecondaryAddress === '0x???')
3841
? [delegationPrimaryAddress, delegationSecondaryAddress]
3942
: [accountAddress];
4043

@@ -66,7 +69,11 @@ const SettingsUniquenessScoreAddresses: FC<SettingsUniquenessScoreAddressesProps
6669
<div className={styles.avatarsGroup}>
6770
{addresses.map(address => (
6871
<div key={address} className={styles.addressAvatar}>
69-
<Identicon className={styles.avatar} username={address} />
72+
{address === '0x???' ? (
73+
<Svg img={octant} size={1.4} />
74+
) : (
75+
<Identicon className={styles.avatar} username={address} />
76+
)}
7077
</div>
7178
))}
7279
</div>

client/src/components/Settings/SettingsUniquenessScoreBox/SettingsUniquenessScoreBox.tsx

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,17 @@ const SettingsUniquenessScoreBox = (): ReactNode => {
8686
} = useRefreshAntisybilStatus();
8787

8888
const { data: antisybilStatusScore, isSuccess: isSuccessAntisybilStatusScore } =
89-
useAntisybilStatusScore(isDelegationCompleted ? delegationSecondaryAddress! : address!, {
90-
enabled:
91-
isSuccessRefreshAntisybilStatus ||
92-
(refreshAntisybilStatusError as null | { message: string })?.message ===
93-
'Address is already used for delegation',
94-
});
89+
useAntisybilStatusScore(
90+
isDelegationCompleted && delegationSecondaryAddress !== '0x???'
91+
? delegationSecondaryAddress!
92+
: address!,
93+
{
94+
enabled:
95+
isSuccessRefreshAntisybilStatus ||
96+
(refreshAntisybilStatusError as null | { message: string })?.message ===
97+
'Address is already used for delegation',
98+
},
99+
);
95100

96101
const checkDelegation = async () => {
97102
if (!isUserTOSAccepted) {
@@ -139,6 +144,10 @@ const SettingsUniquenessScoreBox = (): ReactNode => {
139144
if (isDelegationCompleted) {
140145
setSecondaryAddressScore(antisybilStatusScore);
141146
} else {
147+
if (refreshAntisybilStatusError) {
148+
setDelegationPrimaryAddress(address);
149+
setDelegationSecondaryAddress('0x???');
150+
}
142151
setPrimaryAddressScore(
143152
antisybilStatusScore < DELEGATION_MIN_SCORE && uqScore === 100n
144153
? DELEGATION_MIN_SCORE
@@ -147,7 +156,7 @@ const SettingsUniquenessScoreBox = (): ReactNode => {
147156
}
148157
setIsFetchingScore(false);
149158
// eslint-disable-next-line react-hooks/exhaustive-deps
150-
}, [isSuccessAntisybilStatusScore, isFetchingUqScore]);
159+
}, [isSuccessAntisybilStatusScore, isFetchingUqScore, refreshAntisybilStatusError]);
151160

152161
useEffect(() => {
153162
if (
@@ -208,7 +217,12 @@ const SettingsUniquenessScoreBox = (): ReactNode => {
208217
<div className={styles.buttonsWrapper}>
209218
<Button
210219
className={styles.button}
211-
isDisabled={isDelegationCompleted || isFetchingScore || isFetchingUqScore}
220+
isDisabled={
221+
isDelegationCompleted ||
222+
isFetchingScore ||
223+
isFetchingUqScore ||
224+
delegationSecondaryAddress === '0x???'
225+
}
212226
isHigh
213227
onClick={() => setIisRecalculatingScoreModalOpen(true)}
214228
variant="cta"
@@ -224,7 +238,8 @@ const SettingsUniquenessScoreBox = (): ReactNode => {
224238
primaryAddressScore === undefined ||
225239
primaryAddressScore >= 20 ||
226240
isFetchingUqScore ||
227-
uqScore === 100n
241+
uqScore === 100n ||
242+
delegationSecondaryAddress === '0x???'
228243
}
229244
isHigh
230245
onClick={() => {

0 commit comments

Comments
 (0)