-
{formatMessage({ id: 'label.project_stats' })}
@@ -36,7 +29,11 @@ export const ProjectStats = () => {
icon={}
direction='bottom'
>
- Project status
+
+ {formatMessage({
+ id: 'component.project-stats.status.tooltip',
+ })}
+
@@ -48,7 +45,11 @@ export const ProjectStats = () => {
icon={}
direction='bottom'
>
- Listing
+
+ {formatMessage({
+ id: 'component.project-stats.listing.tooltip',
+ })}
+
@@ -62,14 +63,21 @@ export const ProjectStats = () => {
icon={
}
direction='bottom'
>
-
Verification status
+
+ {formatMessage({
+ id: 'component.project-stats.verification.tooltip',
+ })}
+
{projectData?.verified ? (
) : projectData?.verificationFormStatus ? (
) : (
{
);
};
-const Title = styled(SemiTitle)`
- font-weight: 500;
- padding-bottom: 16px;
- border-bottom: 1px solid ${neutralColors.gray[300]};
- margin-bottom: 16px;
-`;
-
const StatRow = styled(Flex)``;
const StatTooltip = styled(Subline)`
diff --git a/src/components/views/project/projectActionCard/QFSection.tsx b/src/components/views/project/projectActionCard/QFSection.tsx
index e0f33e67ac..94789917f7 100644
--- a/src/components/views/project/projectActionCard/QFSection.tsx
+++ b/src/components/views/project/projectActionCard/QFSection.tsx
@@ -28,7 +28,7 @@ import { TooltipContent } from '@/components/modals/HarvestAll.sc';
import { formatDonations } from '@/helpers/number';
const QFSection = () => {
- const { formatMessage, locale } = useIntl();
+ const { formatMessage } = useIntl();
const { projectData } = useProjectContext();
const { estimatedMatching, sumDonationValueUsdForActiveQfRound } =
projectData || {};
@@ -56,7 +56,7 @@ const QFSection = () => {
} direction='top'>
{formatMessage({
- id: 'tooltip.donation.matching',
+ id: 'component.qf-section.tooltip',
})}
@@ -77,9 +77,9 @@ const QFSection = () => {
$
- {(
- sumDonationValueUsdForActiveQfRound || 0
- ).toLocaleString(locale)}
+ {formatDonations(
+ sumDonationValueUsdForActiveQfRound || 0,
+ )}
{formatMessage({
diff --git a/src/components/views/project/projectDonations/ProjectTotalFundCard.tsx b/src/components/views/project/projectDonations/ProjectTotalFundCard.tsx
index 04c4bfd55f..88c1913a46 100644
--- a/src/components/views/project/projectDonations/ProjectTotalFundCard.tsx
+++ b/src/components/views/project/projectDonations/ProjectTotalFundCard.tsx
@@ -162,8 +162,7 @@ const ProjectTotalFundCard = ({ selectedQF }: IProjectTotalFundCardProps) => {
) : (
- Round:
- QF round {selectedQF.id} donations
+ {selectedQF.name} donations
{roundDonorsCount && roundDonorsCount > 0 ? (
@@ -175,7 +174,7 @@ const ProjectTotalFundCard = ({ selectedQF }: IProjectTotalFundCardProps) => {
alignItems='center'
>
- + {formatDonations(matchFund, '$')}
+ + {formatDonations(matchFund, '$', true)}
{selectedQFData?.isActive
diff --git a/src/components/views/project/projectGIVPower/index.tsx b/src/components/views/project/projectGIVPower/index.tsx
index f985a2b708..17c1abea03 100644
--- a/src/components/views/project/projectGIVPower/index.tsx
+++ b/src/components/views/project/projectGIVPower/index.tsx
@@ -6,10 +6,9 @@ import NoBoost from '@/components/views/project/projectGIVPower/NoBoost';
import { IPowerBoosting } from '@/apollo/types/types';
import Pagination from '@/components/Pagination';
import { Flex } from '@/components/styled-components/Flex';
-import LoadingAnimation from '@/animations/loading_giv.json';
-import LottieControl from '@/components/LottieControl';
import { useProjectContext } from '@/context/project.context';
import { GIVpowerCard } from './GIVpowerCard';
+import { WrappedSpinner } from '@/components/Spinner';
export interface IPowerBoostingWithUserGIVpower
extends Omit {
@@ -33,8 +32,7 @@ const ProjectGIVPowerIndex: FC = () => {
const hasGivPower = boostersData ? boostersData.totalCount > 0 : false;
const totalCount = boostersData?.totalCount ?? 0;
- if (isBoostingsLoading)
- return ;
+ if (isBoostingsLoading) return ;
return hasGivPower ? (
<>
diff --git a/src/components/views/projects/ProjectsFiltersButton.tsx b/src/components/views/projects/ProjectsFiltersButton.tsx
index 97b14e1ab9..d6d69efb5c 100644
--- a/src/components/views/projects/ProjectsFiltersButton.tsx
+++ b/src/components/views/projects/ProjectsFiltersButton.tsx
@@ -13,16 +13,20 @@ const ProjectsFiltersButton = () => {
const [isFilterOpen, setIsFilterOpen] = useState(false);
const filtersCount = variables?.filters?.length ?? 0;
const campaignCount = variables?.campaignSlug ? 1 : 0;
- const count = filtersCount + campaignCount - (isQF ? 1 : 0);
+ const count = filtersCount + campaignCount;
const delayedIsFilterOpen = useDelay(isFilterOpen, 280);
const filterMenuRef = useRef(null);
- useOnClickOutside(filterMenuRef, () => setIsFilterOpen(false));
+ useOnClickOutside(
+ filterMenuRef,
+ () => setIsFilterOpen(false),
+ isFilterOpen,
+ );
const handleFilterClose = (e: MouseEvent) => {
- e.stopPropagation();
+ e.stopPropagation && e.stopPropagation();
setIsFilterOpen(false);
};
diff --git a/src/components/views/projects/ProjectsIndex.tsx b/src/components/views/projects/ProjectsIndex.tsx
index f410ec6001..c343e1a00b 100644
--- a/src/components/views/projects/ProjectsIndex.tsx
+++ b/src/components/views/projects/ProjectsIndex.tsx
@@ -30,8 +30,6 @@ import { useProjectsContext } from '@/context/projects.context';
import ProjectsFiltersDesktop from '@/components/views/projects/ProjectsFiltersDesktop';
import ProjectsFiltersTablet from '@/components/views/projects/ProjectsFiltersTablet';
import ProjectsFiltersMobile from '@/components/views/projects/ProjectsFiltersMobile';
-import LottieControl from '@/components/LottieControl';
-import LoadingAnimation from '@/animations/loading_giv.json';
import useDetectDevice from '@/hooks/useDetectDevice';
import { Flex, FlexCenter } from '@/components/styled-components/Flex';
import ProjectsSortSelect from './ProjectsSortSelect';
@@ -41,6 +39,7 @@ import { QFProjectsBanner } from './QFProjectsBanner';
import { PassportBanner } from '@/components/PassportBanner';
import { QFProjectsMiddleBanner } from './MiddleBanners/QFMiddleBanner';
import { QFNoResultBanner } from './MiddleBanners/QFNoResultBanner';
+import { Spinner } from '@/components/Spinner';
export interface IProjectsView {
projects: IProject[];
@@ -246,10 +245,7 @@ const ProjectsIndex = (props: IProjectsView) => {
<>
{isLoading && (
-
+
)}
diff --git a/src/components/views/projects/ProjectsNoResults.tsx b/src/components/views/projects/ProjectsNoResults.tsx
index 20133a8bdf..ef540c06ba 100644
--- a/src/components/views/projects/ProjectsNoResults.tsx
+++ b/src/components/views/projects/ProjectsNoResults.tsx
@@ -19,7 +19,7 @@ const ProjectsNoResults = (props: { mainCategories: IMainCategory[] }) => {
{formatMessage({
- id: 'label.there_is_no_projects_matching_your_search',
+ id: 'label.there_are_no_projects_matching_your_search',
})}
diff --git a/src/components/views/projects/ProjectsSortSelect.tsx b/src/components/views/projects/ProjectsSortSelect.tsx
index b955515211..0476344f4b 100644
--- a/src/components/views/projects/ProjectsSortSelect.tsx
+++ b/src/components/views/projects/ProjectsSortSelect.tsx
@@ -9,9 +9,9 @@ import {
IconDonation16,
neutralColors,
P,
- IconRocketInSpace16,
IconFast16,
IconFlash16,
+ IconRocketInSpace16,
} from '@giveth/ui-design-system';
import Select, {
components,
@@ -65,12 +65,12 @@ const ProjectsSortSelect = () => {
icon: ,
},
{
- label: formatMessage({ id: 'label.most_liked' }),
+ label: formatMessage({ id: 'label.likes' }),
value: EProjectsSortBy.MOST_LIKED,
icon: ,
},
{
- label: formatMessage({ id: 'label.most_funded' }),
+ label: formatMessage({ id: 'label.amount_raised' }),
value: EProjectsSortBy.MOST_FUNDED,
icon: ,
},
diff --git a/src/components/views/projects/QFProjectsBanner.tsx b/src/components/views/projects/QFProjectsBanner.tsx
index b926266c67..e53c13fe12 100644
--- a/src/components/views/projects/QFProjectsBanner.tsx
+++ b/src/components/views/projects/QFProjectsBanner.tsx
@@ -1,10 +1,19 @@
-import { semanticColors, H1, B, Lead } from '@giveth/ui-design-system';
+import {
+ semanticColors,
+ H1,
+ B,
+ Lead,
+ Container,
+ Row,
+ H2,
+ Col,
+ mediaQueries,
+} from '@giveth/ui-design-system';
import { useIntl } from 'react-intl';
import styled from 'styled-components';
import Image from 'next/image';
import { useState, useEffect } from 'react';
import { useProjectsContext } from '@/context/projects.context';
-import { BannerContainer } from './ProjectsBanner';
import { Flex } from '@/components/styled-components/Flex';
import { getNowUnixMS } from '@/helpers/time';
import { durationToString } from '@/lib/helpers';
@@ -51,6 +60,14 @@ export const QFProjectsBanner = () => {
}
const interval = setInterval(() => {
const diff = _date - getNowUnixMS();
+ if (diff <= 0) {
+ if (state === ERoundStatus.NOT_STARTED) {
+ setState(ERoundStatus.RUNNING);
+ } else if (state === ERoundStatus.RUNNING) {
+ setState(ERoundStatus.ENDED);
+ }
+ return;
+ }
setTimer(diff);
}, 1000);
return () => {
@@ -59,48 +76,85 @@ export const QFProjectsBanner = () => {
}, [state, activeRound]);
return (
-
+
-
- {formatMessage({ id: 'label.quadratic_funding' })}
- {activeRound ? ' - ' + activeRound.name : null}
-
- {(state === ERoundStatus.NOT_STARTED ||
- state === ERoundStatus.RUNNING) && (
-
-
- {formatMessage({
- id:
- state === ERoundStatus.NOT_STARTED
- ? 'label.round_starts_in'
- : 'label.round_ends_in',
- })}
-
-
- {activeRound && timer
- ? durationToString(timer, 3)
- : '--'}
-
-
- )}
+
+
+
+
+ {formatMessage({ id: 'label.quadratic_funding' })}
+
+ {activeRound ? activeRound.name : null}
+ {(state === ERoundStatus.NOT_STARTED ||
+ state === ERoundStatus.RUNNING) && (
+
+
+ {formatMessage({
+ id:
+ state === ERoundStatus.NOT_STARTED
+ ? 'label.round_starts_in'
+ : 'label.round_ends_in',
+ })}
+
+
+ {activeRound && timer && timer > 0
+ ? durationToString(timer, 3)
+ : '--'}
+
+
+ )}
+
+
+
+
+
+
);
};
-const Title = styled(H1)`
+const BannerContainer = styled.div`
+ position: relative;
+ padding-top: 100px;
+ padding-bottom: 100px;
+`;
+
+const StyledCol = styled(Col)`
+ position: relative;
z-index: 1;
+ min-height: 300px;
+ text-align: center;
+ ${mediaQueries.laptopS} {
+ text-align: left;
+ }
+`;
+
+const Title = styled(H1)`
+ margin-top: 32px;
+ color: ${semanticColors.golden[500]};
+`;
+
+const Name = styled(H2)`
color: ${semanticColors.golden[500]};
- margin-bottom: 32px;
`;
const Desc = styled(Flex)`
- z-index: 1;
color: ${semanticColors.jade[100]};
align-items: center;
+ justify-content: center;
gap: 8px;
+ margin-bottom: 32px;
+ ${mediaQueries.laptopS} {
+ justify-content: left;
+ }
`;
diff --git a/src/components/views/userProfile/projectsTab/ProjectsTable.tsx b/src/components/views/userProfile/projectsTab/ProjectsTable.tsx
index f1e0be0232..02416fa755 100644
--- a/src/components/views/userProfile/projectsTab/ProjectsTable.tsx
+++ b/src/components/views/userProfile/projectsTab/ProjectsTable.tsx
@@ -17,7 +17,7 @@ import InternalLink from '@/components/InternalLink';
import ListingBadge from '@/components/ListingBadge';
import StatusBadge from '@/components/views/userProfile/projectsTab/StatusBadge';
import SortIcon from '@/components/SortIcon';
-import { EVerificationStatus, IProject } from '@/apollo/types/types';
+import { IProject } from '@/apollo/types/types';
import { mediaQueries } from '@/lib/constants/constants';
import VerificationBadge from '@/components/VerificationBadge';
import {
@@ -79,9 +79,7 @@ const ProjectsTable: FC = ({
{projects?.map(project => {
const status = project.status.name;
const isCancelled = status === EProjectStatus.CANCEL;
- const verStatus = project.verified
- ? EVerificationStatus.VERIFIED
- : project.projectVerificationForm?.status;
+
return (
@@ -96,7 +94,13 @@ const ProjectsTable: FC = ({
{project.title}
-
+
diff --git a/src/components/views/verification/EmailVerificationIndex.tsx b/src/components/views/verification/EmailVerificationIndex.tsx
index 4fd16ec24d..b5599a1de1 100644
--- a/src/components/views/verification/EmailVerificationIndex.tsx
+++ b/src/components/views/verification/EmailVerificationIndex.tsx
@@ -7,7 +7,6 @@ import { useRouter } from 'next/router';
import givFontLogo from '/public/images/icons/giv_font_logo.svg';
import check_stars from '/public/images/icons/check_stars.svg';
import failed_stars from '/public/images/icons/failed_stars.svg';
-import LoadingAnimation from '@/animations/loading_giv.json';
import { SEND_EMAIL_VERIFICATION_TOKEN } from '@/apollo/gql/gqlVerification';
import { client } from '@/apollo/apolloClient';
import { slugToVerification } from '@/lib/routeCreators';
@@ -18,7 +17,7 @@ import {
VerificationCard,
VerificationContainer,
} from './Common.sc';
-import LottieControl from '@/components/LottieControl';
+import { WrappedSpinner } from '@/components/Spinner';
export enum EEmailVerificationStatus {
Pending = 'Pending',
@@ -37,9 +36,7 @@ const ContentSelector: FC = ({ status }) => {
case EEmailVerificationStatus.Rejected:
return ;
default:
- return (
-
- );
+ return ;
}
};
diff --git a/src/components/views/verification/Loading.tsx b/src/components/views/verification/Loading.tsx
index 2e581bc8be..1cb448dec5 100644
--- a/src/components/views/verification/Loading.tsx
+++ b/src/components/views/verification/Loading.tsx
@@ -1,12 +1,11 @@
import styled from 'styled-components';
-import LottieControl from '@/components/LottieControl';
import { FlexCenter } from '@/components/styled-components/Flex';
-import LoadingAnimation from '@/animations/loading_giv.json';
+import { WrappedSpinner } from '@/components/Spinner';
export default function LoadingVerification() {
return (
-
+
);
}
diff --git a/src/context/donate.context.tsx b/src/context/donate.context.tsx
index cb597f20b4..3996a313c7 100644
--- a/src/context/donate.context.tsx
+++ b/src/context/donate.context.tsx
@@ -1,5 +1,6 @@
import { createContext, FC, ReactNode, useContext, useState } from 'react';
import { IDonationProject } from '@/apollo/types/types';
+import { hasActiveRound } from '@/helpers/qf';
interface ISuccessDonation {
txHash: string[];
@@ -25,20 +26,12 @@ const DonateContext = createContext({
DonateContext.displayName = 'DonateContext';
-export const DonateProvider: FC = props => {
- const { children, project } = props;
-
- const { qfRounds } = project;
- const activeQFRound = qfRounds?.find(r => r.isActive);
- const qfBeginDate = activeQFRound?.beginDate;
- const now = new Date().toISOString();
- const hasRoundBegun = qfBeginDate ? qfBeginDate < now : false;
- // It's impossible that a round is active and end date is passed, bc backend has a cron job. So, we only check the beginDate
- const hasActiveQFRound = activeQFRound && hasRoundBegun;
-
+export const DonateProvider: FC = ({ children, project }) => {
const [isSuccessDonation, setSuccessDonation] =
useState();
+ const hasActiveQFRound = hasActiveRound(project?.qfRounds);
+
return (
>;
mainCategories: IMainCategory[];
selectedMainCategory?: IMainCategory;
- isQF: boolean;
qfRounds: IQFRound[];
+ isQF: boolean;
+ setIsQF: Dispatch>;
}
const variablesDefaultValue = {
@@ -43,8 +44,9 @@ const ProjectsContext = createContext({
variables: variablesDefaultValue,
setVariables: () => console.log('setVariables not initialed yet!'),
mainCategories: [],
- isQF: false,
qfRounds: [],
+ isQF: false,
+ setIsQF: () => console.log('setIsQF not initialed yet!'),
});
ProjectsContext.displayName = 'ProjectsContext';
@@ -53,12 +55,14 @@ export const ProjectsProvider = (props: {
children: ReactNode;
mainCategories: IMainCategory[];
selectedMainCategory?: IMainCategory;
- isQF?: boolean;
- qfRounds?: IQFRound[];
+ qfRounds: IQFRound[];
+ isQF: boolean;
}) => {
const { children, mainCategories, selectedMainCategory, isQF, qfRounds } =
props;
+ const [_isQF, setIsQF] = useState(isQF);
+
const [variables, setVariables] = useState(
isQF ? variablesDefaultValueWithQF : variablesDefaultValue,
);
@@ -105,7 +109,7 @@ export const ProjectsProvider = (props: {
) as EProjectsFilter[];
}
- if (isQF) {
+ if (_isQF) {
filters
? filters.push(EProjectsFilter.ACTIVE_QF_ROUND)
: (filters = [EProjectsFilter.ACTIVE_QF_ROUND]);
@@ -141,7 +145,7 @@ export const ProjectsProvider = (props: {
router.query.filter,
router.query.campaign,
router.query?.slug,
- isQF,
+ _isQF,
]);
return (
@@ -151,8 +155,9 @@ export const ProjectsProvider = (props: {
setVariables,
mainCategories,
selectedMainCategory,
- isQF: isQF || false,
qfRounds: qfRounds || [],
+ isQF: _isQF || false,
+ setIsQF,
}}
>
{children}
diff --git a/src/features/user/user.slice.ts b/src/features/user/user.slice.ts
index a798efdc88..151fb33d45 100644
--- a/src/features/user/user.slice.ts
+++ b/src/features/user/user.slice.ts
@@ -19,6 +19,7 @@ const initialState: {
isSignedIn: boolean;
balance: string | null;
isLoading: boolean;
+ isUserFullFilled: boolean;
} = {
userData: undefined,
token: undefined,
@@ -26,6 +27,7 @@ const initialState: {
isSignedIn: false,
balance: null,
isLoading: true,
+ isUserFullFilled: false,
};
type UserStateType = RootState['user'];
@@ -121,10 +123,12 @@ export const userSlice = createSlice({
signOutUser(state);
}
state.isLoading = false;
+ state.isUserFullFilled = true;
},
)
.addCase(fetchUserByAddress.rejected, state => {
state.isLoading = false;
+ state.isUserFullFilled = true;
})
.addCase(signToGetToken.fulfilled, (state, action) => {
state.token = action.payload;
diff --git a/src/helpers/number.ts b/src/helpers/number.ts
index 7cb96225df..1c7c4e8cc6 100644
--- a/src/helpers/number.ts
+++ b/src/helpers/number.ts
@@ -49,8 +49,9 @@ export const formatDonations = (
rounded: boolean = false,
): string => {
if (amount === 0) {
- return rounded ? '0' : '0.00';
+ return rounded ? `${symbol}0` : `${symbol}0.00`;
}
+ if (rounded && amount < 1) return `<${symbol}1`;
if (amount < 0.01) return `<${symbol}0.01`;
return !rounded ? symbol + amount.toFixed(2) : symbol + Math.round(amount);
};
diff --git a/src/hooks/useOnClickOutside.tsx b/src/hooks/useOnClickOutside.tsx
index 76b00085d0..00ae4aeed6 100644
--- a/src/hooks/useOnClickOutside.tsx
+++ b/src/hooks/useOnClickOutside.tsx
@@ -3,9 +3,14 @@ import { useEffect, RefObject } from 'react';
export function useOnClickOutside(
ref: RefObject,
handler: (e: MouseEvent | TouchEvent) => void,
+ active: boolean = true,
) {
useEffect(() => {
+ if (!active) return;
+
const listener = (event: MouseEvent | TouchEvent) => {
+ event.stopPropagation();
+ event.preventDefault();
// Do nothing if clicking ref's element or descendent elements
if (!ref.current || ref.current.contains(event.target as Node)) {
return;
@@ -18,5 +23,5 @@ export function useOnClickOutside(
document.removeEventListener('mousedown', listener);
document.removeEventListener('touchstart', listener);
};
- }, [ref, handler]);
+ }, [ref, handler, active]);
}
diff --git a/src/hooks/usePassport.ts b/src/hooks/usePassport.ts
index 592301c3f4..802f752283 100644
--- a/src/hooks/usePassport.ts
+++ b/src/hooks/usePassport.ts
@@ -14,6 +14,7 @@ export enum EPassportState {
NOT_SIGNED,
NOT_CREATED,
NOT_ELIGIBLE,
+ NOT_STARTED,
NOT_ACTIVE_ROUND,
ELIGIBLE,
ENDED,
@@ -36,7 +37,9 @@ const initialInfo = {
export const usePassport = () => {
const { account, library } = useWeb3React();
const [info, setInfo] = useState(initialInfo);
- const user = useAppSelector(state => state.user.userData);
+ const { userData: user, isUserFullFilled } = useAppSelector(
+ state => state.user,
+ );
const updateState = useCallback(
async (refreshUserScores: IPassportInfo) => {
@@ -70,6 +73,14 @@ export const usePassport = () => {
passportScore: refreshUserScores.passportScore,
currentRound: null,
});
+ } else if (
+ getNowUnixMS() < new Date(currentRound.beginDate).getTime()
+ ) {
+ return setInfo({
+ passportState: EPassportState.NOT_STARTED,
+ passportScore: refreshUserScores.passportScore,
+ currentRound: currentRound,
+ });
} else if (
getNowUnixMS() > new Date(currentRound.endDate).getTime()
) {
@@ -158,22 +169,29 @@ export const usePassport = () => {
};
useEffect(() => {
+ console.log('******0', account, isUserFullFilled, user);
if (!account) {
+ console.log('******1', account, isUserFullFilled, user);
return setInfo({
passportState: EPassportState.NOT_CONNECTED,
passportScore: null,
currentRound: null,
});
}
-
+ console.log('******2', account, isUserFullFilled, user);
+ if (!isUserFullFilled) return;
+ console.log('******3', account, isUserFullFilled, user);
const fetchData = async () => {
if (!user || user.passportScore === null) {
+ console.log('******4', account, isUserFullFilled, user);
console.log('Passport score is null in our database');
const passports = getPassports();
//user has not passport account
if (passports[account.toLowerCase()] && user) {
+ console.log('******5', account, isUserFullFilled, user);
await updateState(user);
} else {
+ console.log('******6', account, isUserFullFilled, user);
setInfo({
passportState: EPassportState.NOT_SIGNED,
passportScore: null,
@@ -181,11 +199,12 @@ export const usePassport = () => {
});
}
} else {
+ console.log('******7', account, isUserFullFilled, user);
await updateState(user);
}
};
fetchData();
- }, [account, updateState, user]);
+ }, [account, isUserFullFilled, updateState, user]);
return { info, handleSign, refreshScore };
};
diff --git a/src/lib/constants/Routes.ts b/src/lib/constants/Routes.ts
index 2dc013019f..b9b5e883b1 100644
--- a/src/lib/constants/Routes.ts
+++ b/src/lib/constants/Routes.ts
@@ -21,8 +21,8 @@ const Routes = {
CreateProject: '/create',
Projects: '/projects',
QFProjects: '/qf',
- QuadraticFunding: '/qf',
Project: '/project',
+ ReFiProjects: '/projects/finance',
Donate: `/donate`,
User: `/user`,
AboutUs: '/about',
diff --git a/src/lib/constants/links.ts b/src/lib/constants/links.ts
index 1ddfd10b1e..ad7c406e3f 100644
--- a/src/lib/constants/links.ts
+++ b/src/lib/constants/links.ts
@@ -24,6 +24,8 @@ const links = {
TWITTER: 'https://twitter.com/giveth',
YOUTUBE: 'https://www.youtube.com/givethio',
REDDIT: 'https://reddit.com/r/giveth',
+ INSTAGRAM: 'https://www.instagram.com/giveth.io/',
+ LINKEDIN: 'https://www.linkedin.com/company/givethio/',
DOCS,
GIVFARM_DOCS: DOCS + 'giveconomy/givfarm',
GIVSTREAM_DOCS: DOCS + 'giveconomy/givstream',
diff --git a/src/lib/helpers.ts b/src/lib/helpers.ts
index 4c48dbf9ab..5f908de3f8 100644
--- a/src/lib/helpers.ts
+++ b/src/lib/helpers.ts
@@ -5,7 +5,7 @@ import unescape from 'lodash/unescape';
import { parseEther, parseUnits } from '@ethersproject/units';
import { keccak256 } from '@ethersproject/keccak256';
import { Contract } from '@ethersproject/contracts';
-import { Web3Provider } from '@ethersproject/providers';
+import { TransactionResponse, Web3Provider } from '@ethersproject/providers';
import { AddressZero } from '@ethersproject/constants';
import { brandColors } from '@giveth/ui-design-system';
// @ts-ignore
@@ -254,7 +254,7 @@ export async function sendTransaction(
contractAddress: string,
) {
try {
- let tx;
+ let tx: TransactionResponse;
const txParams: any = {
to: params.to,
};
@@ -278,11 +278,13 @@ export async function sendTransaction(
txCallbacks.onTxHash(tx.hash, tx.nonce);
const receipt = await tx.wait();
- if (receipt.status) {
- txCallbacks.onReceipt(tx.hash);
- }
- console.log('Tx ---> : ', { tx, receipt });
+ setTimeout(() => {
+ if (receipt.status) {
+ txCallbacks.onReceipt(tx.hash);
+ }
+ console.log('Tx ---> : ', { tx, receipt });
+ }, 5000);
} catch (error: any) {
if (error.replacement && !error.cancelled) {
// Speed up the process by replacing the transaction
@@ -450,7 +452,8 @@ export const timeFromNow = (
if (diff.h > 0)
return ` ${formatter(Math.trunc(diff.h * -1), 'hour', options)}`;
if (diff.min > 0)
- return ` ${formatter(Math.trunc(diff.m * -1), 'min', options)}`;
+ return ` ${formatter(Math.trunc(diff.min * -1), 'minute', options)}`;
+
return ` ${defaultMessage}`;
};
diff --git a/src/services/passport.ts b/src/services/passport.ts
index 05887a1ee3..b1dfbbe2ef 100644
--- a/src/services/passport.ts
+++ b/src/services/passport.ts
@@ -67,9 +67,13 @@ export const connectPassport = async (
localStorage.setItem(StorageLabel.TOKEN, jwt);
}
return true;
- } catch (error) {
+ } catch (error: any) {
console.log('error', error);
- showToastError(error);
+ if (error.code === 'ACTION_REJECTED') {
+ showToastError('Rejected By User');
+ } else {
+ showToastError(error);
+ }
return false;
}
};
diff --git a/yarn.lock b/yarn.lock
index 69008699cd..fe2d1807e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -923,10 +923,10 @@
intl-messageformat "10.3.1"
tslib "^2.4.0"
-"@giveth/ui-design-system@^1.11.12":
- version "1.11.12"
- resolved "https://registry.yarnpkg.com/@giveth/ui-design-system/-/ui-design-system-1.11.12.tgz#12ec40b1b4737dcbe3e5ee1d668ccc851f93f0bc"
- integrity sha512-Sr2ILZ2E4FzG/a2ID3K8ty3dXwaum0PRN1/T+kVViR52GnxwwamWIi2ko9agcc4vnOpkWCAxl/AhVLTkSDbyng==
+"@giveth/ui-design-system@^1.11.14":
+ version "1.11.14"
+ resolved "https://registry.yarnpkg.com/@giveth/ui-design-system/-/ui-design-system-1.11.14.tgz#27df4a7e6239e0b27f88dacbda7da8fb6bc9c20b"
+ integrity sha512-PyQycCUz0dAI+xBZkOvensBa+yVuiBdxX04hqmIxD02VkbEPIoGtVbyJ4WRsC8bsXWkphgsN0blNvt8S2e+7fA==
dependencies:
next "13.1.6"
react "18.2.0"