Skip to content

Commit 2f4802e

Browse files
Copilot0xrinegade
andcommitted
Fix merge conflicts and ESLint errors after pulling main branch
Co-authored-by: 0xrinegade <[email protected]>
1 parent 5b878e7 commit 2f4802e

File tree

5 files changed

+671
-988
lines changed

5 files changed

+671
-988
lines changed

src/pages/SurpriseVault/components/GuildSection.tsx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useState, useEffect } from 'react';
1+
import React, { useState, useEffect, useCallback } from 'react';
22
import {
33
Box,
44
Typography,
@@ -24,7 +24,6 @@ import {
2424
EmojiEvents as TrophyIcon,
2525
} from '@mui/icons-material';
2626
import VaultService from '../services/VaultService';
27-
import { Guild as GuildType } from '../types';
2827

2928
const GuildCard = styled(Card)(({ theme }) => ({
3029
background: 'rgba(255, 255, 255, 0.08)',
@@ -131,11 +130,7 @@ const GuildSection: React.FC = () => {
131130

132131
const vaultService = VaultService.getInstance();
133132

134-
useEffect(() => {
135-
loadGuilds();
136-
}, []);
137-
138-
const loadGuilds = async () => {
133+
const loadGuilds = useCallback(async () => {
139134
try {
140135
setLoading(true);
141136
const guildsData = await vaultService.getGuilds();
@@ -158,7 +153,11 @@ const GuildSection: React.FC = () => {
158153
} finally {
159154
setLoading(false);
160155
}
161-
};
156+
}, [vaultService]);
157+
158+
useEffect(() => {
159+
loadGuilds();
160+
}, [loadGuilds]);
162161

163162
const handleCreateGuild = () => {
164163
// Mock guild creation

src/pages/SurpriseVault/components/Leaderboard.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import {
2323
Star as StarIcon
2424
} from '@mui/icons-material';
2525
import VaultService from '../services/VaultService';
26-
import { LeaderboardEntry as LeaderboardEntryType } from '../types';
2726

2827
const LeaderboardCard = styled(Card)(({ theme }) => ({
2928
background: 'rgba(255, 255, 255, 0.08)',

src/pages/SurpriseVault/components/RecentWinners.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import {
2222
Token as TokenIcon
2323
} from '@mui/icons-material';
2424
import VaultService from '../services/VaultService';
25-
import { Winner as WinnerType } from '../types';
2625

2726
const WinnersCard = styled(Card)(({ theme }) => ({
2827
background: 'rgba(255, 255, 255, 0.08)',

src/pages/SurpriseVault/services/VaultService.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ import {
44
LeaderboardEntry,
55
Guild,
66
UserVaultData,
7-
VaultConfig,
8-
VaultEntry,
9-
LotteryDraw,
10-
ReferralData
7+
VaultConfig
118
} from '../types';
129

1310
// Mock data generation utilities

0 commit comments

Comments
 (0)