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.

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

WIP: Improve back option #4506

Open
wants to merge 37 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
547a477
started back improvement
kkatusic Jun 4, 2024
aeac8dc
Merge branch 'develop' into improve_back_option
kkatusic Jun 4, 2024
a69c849
attempt to solve back option with useEffect and local storage
kkatusic Jun 6, 2024
4dce221
Merge branch 'develop' into improve_back_option
kkatusic Jul 4, 2024
e5eeddc
reverted changes
kkatusic Jul 5, 2024
b358443
started implementing useInfiniteQuery from React Query
kkatusic Jul 8, 2024
2845f1b
reverted back again
kkatusic Jul 9, 2024
c56a54f
reverted back again :(
kkatusic Jul 12, 2024
68aa294
set up React Query useInfiniteQuery function
kkatusic Jul 14, 2024
0429727
updated last page variable
kkatusic Jul 16, 2024
ef3c043
continuing
kkatusic Jul 16, 2024
b231f24
renamed variables
kkatusic Jul 19, 2024
a77dd0f
last try
kkatusic Jul 19, 2024
164d482
fetching fixed, removed unnecessary code
kkatusic Jul 22, 2024
214333a
fixed loading duplication
kkatusic Jul 22, 2024
bdcecb7
Merge branch 'develop' into improve_back_option
kkatusic Jul 23, 2024
b0492f4
Added reset query option
kkatusic Jul 23, 2024
ca06836
added scroll to row when you got back
kkatusic Jul 26, 2024
4edea68
removing user.id dependencies
kkatusic Jul 29, 2024
6a64614
fix loading button if something hook up
kkatusic Jul 29, 2024
aa89980
fixed total count and removed unused useEffect
kkatusic Jul 30, 2024
78a9454
fixed total count, introduced total pages
kkatusic Jul 30, 2024
89ba8a4
updated queryKey reference
kkatusic Jul 30, 2024
b8ff375
Merge pull request #4699 from Giveth/develop
Meriem-BM Sep 9, 2024
91b4779
fix givbacks toast button width
divine-comedian Sep 9, 2024
1854c08
Merge pull request #4708 from Giveth/hotfix-givbackstoast-button
Meriem-BM Sep 9, 2024
a29c603
prevent projects with Endaoment label from showing recurring donation…
divine-comedian Sep 9, 2024
57b2ec9
Merge pull request #4710 from Giveth/hotfix-prevent-endaoment-recurri…
divine-comedian Sep 9, 2024
acf812f
Update giv-palooza-bg1.svg
mateodaza Sep 10, 2024
b0bee5e
updating sponsors
mateodaza Sep 10, 2024
a5af3a5
Merge pull request #4713 from Giveth/updating-qf-banner
mateodaza Sep 10, 2024
924f7e3
comment out recurring donation default
divine-comedian Sep 10, 2024
f1e5c87
Merge pull request #4717 from Giveth/comment-out-recurring-donation-d…
divine-comedian Sep 10, 2024
75e9749
adding safe back
mateodaza Sep 11, 2024
5894a46
Merge pull request #4725 from Giveth/multisig-hotfix
mateodaza Sep 11, 2024
a341c98
Merge branch 'main' into improve_back_option
kkatusic Sep 13, 2024
e2b9ae3
fixing total count
kkatusic Sep 16, 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
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@tanstack/react-query": "^5.45.1",
"@vercel/speed-insights": "^1.0.9",
"@web3auth/sign-in-with-solana": "^3.0.0",
"@web3modal/wagmi": "^5.0.7",
"@web3modal/wagmi": "^5.1.7",
"apollo-upload-client": "^18.0.1",
"base58": "^2.0.1",
"bignumber.js": "^9.1.2",
Expand Down Expand Up @@ -72,7 +72,7 @@
"swiper": "^11.1.3",
"unsplash-js": "^7.0.19",
"viem": "^2.16.1",
"wagmi": "^2.11.3"
"wagmi": "^2.12.10"
},
"devDependencies": {
"@babel/preset-typescript": "^7.23.3",
Expand Down
532 changes: 266 additions & 266 deletions public/images/banners/qf-round/giv-palooza.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/components/project-card/ProjectCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ const ProjectCard = (props: IProjectCard) => {
</Link>
</ImagePlaceholder>
<CardBody
id={`project-card-body-${slug}`}
$isHover={
isHover
? hasFooter
Expand Down
13 changes: 8 additions & 5 deletions src/components/views/donate/DonationCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export const DonationCard: FC<IDonationCardProps> = ({
address.chainType === ChainType.EVM &&
address.networkId === config.OPTIMISM_NETWORK_NUMBER,
);
const isEndaomentProject = project?.organization?.label === 'endaoment';

const isOwnerOnEVM =
project?.adminUser?.walletAddress &&
Expand Down Expand Up @@ -93,11 +94,13 @@ export const DonationCard: FC<IDonationCardProps> = ({
// Check if the 'tab' query parameter is not present in the URL and project 'hasOpAddress' is true.
// If both conditions are met, set the active tab to 'RECURRING' using the setTab function.
// This ensures that the 'RECURRING' tab is active by default if project has Op Address.
useEffect(() => {
if (!router.query.tab && hasOpAddress) {
setTab(ETabs.RECURRING);
}
}, [router.query, hasOpAddress]);
//
// this feature needs some more polish, commenting this out for now --mitch
// useEffect(() => {
// if (!router.query.tab && hasOpAddress && !isEndaomentProject) {
// setTab(ETabs.RECURRING);
// }
// }, [router.query, hasOpAddress, isEndaomentProject]);

return (
<DonationCardWrapper>
Expand Down
4 changes: 2 additions & 2 deletions src/components/views/project/ProjectGIVbackToast.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ const ButtonWrapper = styled.div`
flex-direction: row-reverse;
color: ${brandColors.giv[500]};
gap: 0;
width: 200px;
width: 100%;
svg {
margin-right: 8px;
flex-shrink: 0;
Expand All @@ -354,7 +354,7 @@ const Wrapper = styled(Flex)`
border-radius: 16px;
margin-top: 12px;
flex-direction: column;
${mediaQueries.tablet} {
${mediaQueries.laptopL} {
flex-direction: row;
}
`;
Expand Down
Loading
Loading