Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add err message if gamma api fails #48

Merged
merged 2 commits into from
Nov 19, 2024
Merged

feat: add err message if gamma api fails #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be51423
feat: add err message if gamma api fails
ZakMooney Nov 19, 2024
220f322
chore: remove unused consolelogs
ZakMooney Nov 19, 2024
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
3 changes: 0 additions & 3 deletions src/components/tst-staking/StakingSummary.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,6 @@ const StakingSummary = ({

const monthlyProjection = (dailyEarnings * 30) || 0;

console.log(123123, {dailyEarnings}, {daysStaked})


const currentTier = getCurrentTier(stakedAmount);
const nextTier = getNextTier(stakedAmount);

Expand Down
11 changes: 11 additions & 0 deletions src/components/vault/yield/YieldList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ const YieldList = (props) => {
gammaUserLoading,
gammaReturnsLoading,
gammaStatsLoading,
gammaUserErr,
gammaReturnsErr,
gammaStatsErr,
gammaUnavailableMsg,
} = props;

const [ open, setOpen ] = useState('');
Expand All @@ -57,6 +61,8 @@ const YieldList = (props) => {
? SepoliaVaults
: ArbitrumVaults;

const hasAPIErr = gammaUserErr || gammaReturnsErr || gammaStatsErr;

return (
<div className="">
<Typography variant="h2" className="card-title flex gap-0">
Expand All @@ -65,6 +71,9 @@ const YieldList = (props) => {
/>
Yield Pools
</Typography>
{hasAPIErr ? (
gammaUnavailableMsg()
) : null}
<table className="table">
<thead>
<tr>
Expand Down Expand Up @@ -208,6 +217,8 @@ const YieldList = (props) => {
gammaUserLoading={gammaUserLoading}
gammaReturnsLoading={gammaReturnsLoading}
gammaStatsLoading={gammaStatsLoading}
hasAPIErr={hasAPIErr}
gammaUnavailableMsg={gammaUnavailableMsg}
/>
</div>
);
Expand Down
34 changes: 34 additions & 0 deletions src/components/vault/yield/YieldParent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,16 @@ const YieldParent = (props) => {
const { smartVaultABI } = useSmartVaultABIStore();
const [ gammaUser, setGammaUser ] = useState({});
const [ gammaUserLoading, setGammaUserLoading ] = useState(false);
const [ gammaUserErr, setGammaUserErr ] = useState(false);
const [ gammaReturns, setGammaReturns ] = useState([]);
const [ gammaReturnsLoading, setGammaReturnsLoading ] = useState(false);
const [ gammaReturnsErr, setGammaReturnsErr ] = useState(false);
const [ gammaStats, setGammaStats ] = useState([]);
const [ gammaStatsLoading, setGammaStatsLoading ] = useState(false);
const [ gammaStatsErr, setGammaStatsErr ] = useState(false);
const [ merklRewards, setMerklRewards ] = useState([]);
const [ merklRewardsLoading, setMerklRewardsLoading ] = useState(true);
const [ merklRewardsErr, setMerklRewardsErr ] = useState(false);

const [ userSummary, setUserSummary ] = useState([]);

Expand Down Expand Up @@ -93,8 +97,10 @@ const YieldParent = (props) => {

setMerklRewards(rewardsArray);
setMerklRewardsLoading(false);
setMerklRewardsErr(false);
} catch (error) {
setMerklRewardsLoading(false);
setMerklRewardsErr(true);
console.log(error);
}
};
Expand All @@ -110,8 +116,10 @@ const YieldParent = (props) => {

setGammaUser(useData);
setGammaUserLoading(false);
setGammaUserErr(false);
} catch (error) {
setGammaUserLoading(false);
setGammaUserErr(true);
console.log(error);
}
};
Expand All @@ -137,8 +145,10 @@ const YieldParent = (props) => {

setGammaReturns(hypervisorReturns);
setGammaReturnsLoading(false);
setGammaReturnsErr(true);
} catch (error) {
setGammaReturnsLoading(false);
setGammaReturnsErr(true);
console.log(error);
}
};
Expand All @@ -164,8 +174,10 @@ const YieldParent = (props) => {

setGammaStats(hypervisorStats);
setGammaStatsLoading(false);
setGammaStatsErr(false);
} catch (error) {
setGammaStatsLoading(false);
setGammaStatsErr(true);
console.log(error);
}
};
Expand Down Expand Up @@ -223,6 +235,21 @@ const YieldParent = (props) => {
})
};

const gammaUnavailableMsg = () => {
return (
<>
<div className="bg-amber-600/40 p-4 rounded-lg w-full flex flex-col">
<Typography variant="p">
<b>3rd Party API Not Responding</b>
</Typography>
<Typography variant="p">
This may prevent us from displaying some blockchain data.
</Typography>
</div>
</>
)
}

return (
<div className="flex-1 grow-[3]">
{yieldEnabled ? (
Expand All @@ -240,6 +267,10 @@ const YieldParent = (props) => {
gammaUserLoading={gammaUserLoading}
gammaReturnsLoading={gammaReturnsLoading}
gammaStatsLoading={gammaStatsLoading}
gammaUserErr={gammaUserErr}
gammaReturnsErr={gammaReturnsErr}
gammaStatsErr={gammaStatsErr}
gammaUnavailableMsg={gammaUnavailableMsg}
/>
</div>
</Card>
Expand All @@ -251,6 +282,9 @@ const YieldParent = (props) => {
userSummary={userSummary}
merklRewards={merklRewards}
merklRewardsLoading={merklRewardsLoading}
gammaUserErr={gammaUserErr}
merklRewardsErr={merklRewardsErr}
gammaUnavailableMsg={gammaUnavailableMsg}
/>
</div>
</Card>
Expand Down
8 changes: 7 additions & 1 deletion src/components/vault/yield/YieldPerformanceModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ const YieldPerformanceModal = ({
gammaUserLoading,
gammaReturnsLoading,
gammaStatsLoading,
hasAPIErr,
gammaUnavailableMsg,
}) => {

const positionUser = gammaUser?.[yieldHypervisor.toLowerCase()] || {};
Expand Down Expand Up @@ -143,7 +145,11 @@ const YieldPerformanceModal = ({
</Typography>
</div>
<div>

{hasAPIErr ? (
<div className="mb-4">
{gammaUnavailableMsg()}
</div>
) : null}
<div className="grid grid-cols-2 gap-4 mb-4">
<div className="bg-base-300/40 p-4 rounded-lg w-full">
<Typography variant="p">
Expand Down
8 changes: 8 additions & 0 deletions src/components/vault/yield/YieldSummary.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ const YieldSummary = ({
userSummary,
merklRewards,
merklRewardsLoading,
gammaUserErr,
merklRewardsErr,
gammaUnavailableMsg,
}) => {
const { merklRewardsUSD } = useMerklRewardsUSD();

Expand Down Expand Up @@ -144,6 +147,8 @@ const YieldSummary = ({

const metrics = calculateMetrics(positions);

const hasAPIErr = gammaUserErr || merklRewardsErr;

return (
<>

Expand All @@ -159,6 +164,9 @@ const YieldSummary = ({
{getPerformanceMessage(metrics.totalYieldEarned, metrics.totalMarketYield)}
</Typography>
</div>
{hasAPIErr ? (
gammaUnavailableMsg()
) : null}
<div className="bg-base-300/40 p-4 rounded-lg w-full flex items-center">
<div className="w-full">
<Typography variant="p">
Expand Down
Loading