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

Sorin/yoext 1591/uat fixes #3780

Merged
merged 3 commits into from
Dec 17, 2024
Merged

Sorin/yoext 1591/uat fixes #3780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67320fc
fix: graph tooltip color
SorinC6 Dec 10, 2024
4c3f059
fix: interval data when sort
SorinC6 Dec 10, 2024
8b417da
Merge branch 'develop' into sorin/YOEXT-1591/uat-fixes
vsubhuman Dec 17, 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
2 changes: 1 addition & 1 deletion packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const useChart = (data: IChartData) => {
x={rectX + rectWidth / 2}
y={rectY + rectHeight / 2}
textAnchor="middle"
fill={theme.palette.ds.primary_200}
fill={theme.palette.ds.white_static}
alignmentBaseline="middle"
sx={{
fontFamily: theme.typography.fontFamily,
Expand Down
16 changes: 12 additions & 4 deletions packages/yoroi-extension/app/UI/features/portfolio/useCases/TokensTable/useProcentage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,25 @@ import { atomicBreakdown } from '@yoroi/common';
import BigNumber from 'bignumber.js';
import { useMemo } from 'react';
import { formatValue } from '../../common/components/PortfolioHeader';
import { TOKEN_CHART_INTERVAL } from '../../common/helpers/constants';
import { priceChange } from '../../common/helpers/priceChange';
import { useGetPortfolioTokenChart } from '../../common/hooks/usePortfolioTokenChart';
import { usePortfolio } from '../../module/PortfolioContextProvider';
import { bigNumberToBigInt } from './TableColumnsChip';

export const useProcessedTokenData = ({ data, ptActivity, data24h, data7d, data30d }) => {
const { primaryTokenInfo } = usePortfolio();
const { data: ptTokenDataInterval7d } = useGetPortfolioTokenChart(TOKEN_CHART_INTERVAL.WEEK, {
info: { id: '' },
});
const { data: ptTokenDataInterval1M } = useGetPortfolioTokenChart(TOKEN_CHART_INTERVAL.MONTH, {
info: { id: '' },
});

// Helper to calculate fiat value and unit price for a token
const calculateTotalFiatForToken = token => {
const isPrimaryToken = token.id === '-';
const secondaryToken24Activity = data24h?.[token.info.id];

const tokenPrice =
isPrimaryToken && !secondaryToken24Activity ? ptActivity?.close : secondaryToken24Activity?.[1].price?.close || 1;

Expand All @@ -34,6 +41,7 @@ export const useProcessedTokenData = ({ data, ptActivity, data24h, data7d, data3

const getTokenActivityChange = (tokenId, activityData, isPrimaryToken) => {
const activity = activityData?.[tokenId];

return isPrimaryToken
? { open: ptActivity?.open, close: ptActivity?.close }
: { open: activity?.[1].price?.open, close: activity?.[1].price?.close };
Expand Down Expand Up @@ -71,12 +79,12 @@ export const useProcessedTokenData = ({ data, ptActivity, data24h, data7d, data3
totalAmount: totalValue,
price: unitPrice,
'24h': changePercent24,
'1W': Number(changePercent7d),
'1M': changePercent30d,
'1W': isPrimaryToken ? ptTokenDataInterval7d?.[167]?.changePercent : changePercent7d,
'1M': isPrimaryToken ? ptTokenDataInterval1M?.[179]?.changePercent : changePercent30d,
};
})
.sort((a, b) => b.percentage - a.percentage);
}, [data, ptActivity, data24h, data7d, data30d, primaryTokenInfo]);
}, [data, ptActivity, data24h, data7d, data30d, primaryTokenInfo, ptTokenDataInterval7d, ptTokenDataInterval1M]);

return processedData;
};
Loading