diff --git a/src/pages/Funds/Cards/Card.tsx b/src/pages/Funds/Cards/Card.tsx
index 352abdce9e..186c3f7240 100644
--- a/src/pages/Funds/Cards/Card.tsx
+++ b/src/pages/Funds/Cards/Card.tsx
@@ -39,7 +39,7 @@ export default function Card({
diff --git a/src/pages/Funds/Cards/Progress.tsx b/src/pages/Funds/Cards/Progress.tsx
index b981090109..515adaff3d 100644
--- a/src/pages/Funds/Cards/Progress.tsx
+++ b/src/pages/Funds/Cards/Progress.tsx
@@ -4,7 +4,7 @@ import type { Fund } from "types/aws";
export function Progress(
props: Pick
) {
- if (!props.target) {
+ if (props.target === "0") {
if (!props.donation_total_usd) return;
return (
diff --git a/src/pages/Funds/CreateFund/CreateFund.tsx b/src/pages/Funds/CreateFund/CreateFund.tsx
index d67ad7da65..7aefbd2471 100644
--- a/src/pages/Funds/CreateFund/CreateFund.tsx
+++ b/src/pages/Funds/CreateFund/CreateFund.tsx
@@ -15,18 +15,14 @@ import { useErrorContext } from "contexts/ErrorContext";
import { useModalContext } from "contexts/ModalContext";
import { logger } from "helpers";
import { getFullURL, uploadFiles } from "helpers/uploadFiles";
-import {
- AVATAR_MAX_SIZE_BYTES,
- AVATAR_MIME_TYPE,
-} from "pages/UserDashboard/EditProfile/useRhf";
import { useRef } from "react";
import { type SubmitHandler, useController, useForm } from "react-hook-form";
import { Link } from "react-router-dom";
import { useLazyProfileQuery } from "services/aws/aws";
import { useCreateFundMutation } from "services/aws/funds";
import type { Fund } from "types/aws";
+import { GoalSelector, MAX_SIZE_IN_BYTES, VALID_MIME_TYPES } from "../common";
import { EndowmentSelector } from "./EndowmentSelector";
-import GoalSelector from "./GoalSelector";
import { schema } from "./schema";
import type { FormValues as FV } from "./types";
@@ -112,15 +108,16 @@ export default withAuth(function CreateFund() {
liquidSplitPct: fv.settings.liquidSplit,
allowBgTip: fv.settings.allowBgTip,
},
+ target:
+ fv.targetType === "none"
+ ? `${0}`
+ : fv.targetType === "smart"
+ ? "smart"
+ : `${+fv.fixedTarget}`,
};
if (fv.expiration) fund.expiration = fv.expiration;
- if (fv.targetType !== "none") {
- fund.target =
- fv.targetType === "fixed" ? (fv.fixedTarget as `${number}`) : "smart";
- }
-
const res = await createFund(fund).unwrap();
showModal(Prompt, {
@@ -230,7 +227,7 @@ export default withAuth(function CreateFund() {
/>
{targetType.value === "fixed" && (
({
file: genFileSchema(MAX_SIZE_IN_BYTES, VALID_MIME_TYPES).required("required"),
});
diff --git a/src/pages/Funds/CreateFund/types.ts b/src/pages/Funds/CreateFund/types.ts
index 314083d7c1..e58b2d4073 100644
--- a/src/pages/Funds/CreateFund/types.ts
+++ b/src/pages/Funds/CreateFund/types.ts
@@ -1,4 +1,5 @@
import type { ImgLink } from "components/ImgEditor";
+import type { TargetType } from "../common";
export interface FundMember {
id: number;
@@ -13,8 +14,6 @@ export interface Settings {
allowBgTip: boolean;
}
-export type TargetType = "fixed" | "none" | "smart";
-
export interface FormValues {
name: string;
description: string;
diff --git a/src/pages/Funds/EditFund/EditFund.tsx b/src/pages/Funds/EditFund/EditFund.tsx
new file mode 100644
index 0000000000..8b26078520
--- /dev/null
+++ b/src/pages/Funds/EditFund/EditFund.tsx
@@ -0,0 +1,50 @@
+import { skipToken } from "@reduxjs/toolkit/query";
+import Icon from "components/Icon";
+import { ErrorStatus, LoadingStatus } from "components/Status";
+import withAuth from "contexts/Auth";
+import { useParams } from "react-router-dom";
+import { useFundQuery } from "services/aws/funds";
+import { Form } from "./Form";
+
+const containerClass = "padded-container mt-8 grid content-start";
+export default withAuth(function EditFund({ user }) {
+ const { fundId = "" } = useParams();
+
+ const { data, isLoading, isError } = useFundQuery(fundId || skipToken);
+
+ if (isLoading) {
+ return (
+
+ Getting fund...
+
+ );
+ }
+
+ if (isError || !data) {
+ return (
+
+ Failed to get fund
+
+ );
+ }
+
+ if (!user.funds.includes(fundId)) {
+ return (
+
+ );
+ }
+
+ if (!data.active) {
+ return (
+
+
+
This fund is already closed
+
+ {props.featured ? (
+
Your fund is visible in the funds page
+ ) : (
+
+ Your endowment is not visible in the funds page
+
+ )}
+
+
+ {props.isToggling
+ ? "Updating.."
+ : props.featured
+ ? "Unpublish"
+ : "Publish"}
+
+
+ View
+
+
+
= async ({
+ targetType,
+ fixedTarget,
+ logo,
+ banner,
+ ...fv
+ }) => {
+ try {
+ const [bannerUrl, logoUrl] = await uploadImgs([banner, logo], () => {
+ showModal(
+ Prompt,
+ { type: "loading", children: "Uploading images.." },
+ { isDismissible: false }
+ );
+ });
+
+ /// BUILD UPDATE ///
+ const update: Fund.Update = {};
+
+ if (rhf.dirtyFields.targetType || rhf.dirtyFields.fixedTarget) {
+ update.target =
+ targetType === "none"
+ ? "0"
+ : targetType === "smart"
+ ? "smart"
+ : (fixedTarget as `${number}`);
+ }
+
+ if (rhf.dirtyFields.banner) update.banner = bannerUrl;
+ if (rhf.dirtyFields.logo) update.logo = logoUrl;
+ if (rhf.dirtyFields.name) update.name = fv.name;
+ if (rhf.dirtyFields.description) update.description = fv.description;
+
+ await editFund({
+ ...update,
+ id: props.id,
+ }).unwrap();
+ showModal(Prompt, {
+ type: "success",
+ children: "Successfully updated fund!",
+ });
+ } catch (err) {
+ handleError(err, { context: "updating fund" });
+ }
+ };
+
+ return (
+
+ {
+ try {
+ await editFund({
+ id: props.id,
+ featured: !props.featured,
+ }).unwrap();
+ } catch (err) {
+ handleError(err, { context: "updating fund" });
+ }
+ }}
+ classes="my-4"
+ />
+
+ Logo
+ {
+ rhf.logo.onChange(v);
+ rhf.trigger("logo.file");
+ }}
+ onUndo={(e) => {
+ e.stopPropagation();
+ rhf.resetField("logo");
+ }}
+ accept={VALID_MIME_TYPES}
+ aspect={[1, 1]}
+ classes={{ container: "w-80 aspect-[1/1]" }}
+ maxSize={MAX_SIZE_IN_BYTES}
+ error={rhf.errors.logo?.file?.message}
+ />
+
+ Banner
+ {
+ rhf.banner.onChange(v);
+ rhf.trigger("banner.file");
+ }}
+ onUndo={(e) => {
+ e.stopPropagation();
+ rhf.resetField("banner");
+ }}
+ accept={VALID_MIME_TYPES}
+ aspect={[4, 1]}
+ classes={{ container: "w-full aspect-[4/1]" }}
+ maxSize={MAX_SIZE_IN_BYTES}
+ error={rhf.errors.banner?.file?.message}
+ />
+
+
+ Fundraiser goal *
+
+
+ {
+ try {
+ const fundNameConfirmation = window.prompt(
+ "Type the name of this fund to confirm"
+ );
+ if (!fundNameConfirmation) return;
+ if (fundNameConfirmation !== props.name) {
+ return window.alert("Fund not closed: name is not confirmed");
+ }
+
+ await closeFund(props.id).unwrap();
+ } catch (err) {
+ handleError(err, { context: "closing fund" });
+ }
+ }}
+ type="button"
+ className="btn-red text-sm font-medium px-4 py-2 justify-self-end"
+ >
+ {isClosingFund ? "Closing.." : "Close fund"}
+
+
+ Update fund
+
+
+
+ );
+}
+
+async function uploadImgs(
+ imgs: ImgLink[],
+ onUpload: () => void
+): Promise {
+ const files = imgs.flatMap((img) => (img.file ? [img.file] : []));
+ if (files.length > 0) onUpload();
+ const baseURL = await uploadFiles(files, "endow-profiles");
+ return imgs.map((img) =>
+ img.file && baseURL ? getFullURL(baseURL, img.file.name) : img.publicUrl
+ );
+}
diff --git a/src/pages/Funds/EditFund/index.ts b/src/pages/Funds/EditFund/index.ts
new file mode 100644
index 0000000000..bbdd2bec33
--- /dev/null
+++ b/src/pages/Funds/EditFund/index.ts
@@ -0,0 +1 @@
+export { default as Component } from "./EditFund";
diff --git a/src/pages/Funds/EditFund/types.ts b/src/pages/Funds/EditFund/types.ts
new file mode 100644
index 0000000000..059ba933fa
--- /dev/null
+++ b/src/pages/Funds/EditFund/types.ts
@@ -0,0 +1,10 @@
+import type { ImgLink } from "components/ImgEditor";
+import type { Fund } from "types/aws";
+import type { TargetType } from "../common";
+
+export interface FV extends Pick {
+ targetType: TargetType;
+ fixedTarget: string;
+ banner: ImgLink;
+ logo: ImgLink;
+}
diff --git a/src/pages/Funds/EditFund/useRhf.ts b/src/pages/Funds/EditFund/useRhf.ts
new file mode 100644
index 0000000000..e68887e2b6
--- /dev/null
+++ b/src/pages/Funds/EditFund/useRhf.ts
@@ -0,0 +1,90 @@
+import { yupResolver } from "@hookform/resolvers/yup";
+import type { ImgLink } from "components/ImgEditor";
+import { useController, useForm } from "react-hook-form";
+import { genFileSchema } from "schemas/file";
+import { schema as schemaFn, stringNumber } from "schemas/shape";
+import type { Fund } from "types/aws";
+import { string } from "yup";
+import {
+ MAX_SIZE_IN_BYTES,
+ type TargetType,
+ VALID_MIME_TYPES,
+} from "../common";
+import type { FV } from "./types";
+
+const fileObj = schemaFn({
+ file: genFileSchema(MAX_SIZE_IN_BYTES, VALID_MIME_TYPES),
+});
+
+const targetTypeKey: keyof FV = "targetType";
+const schema = schemaFn({
+ name: string().required("required"),
+ description: string().required("required"),
+ fixedTarget: stringNumber(
+ (str) => {
+ return str.when(targetTypeKey, (values, schema) => {
+ const [type] = values as [TargetType];
+ return type === "fixed" ? schema.required("required") : schema;
+ });
+ },
+ (n) => {
+ return n.when(targetTypeKey, (values, schema) => {
+ const [type] = values as [TargetType];
+ return type === "fixed"
+ ? schema.positive("must be greater than 0")
+ : schema;
+ });
+ }
+ ),
+ logo: fileObj,
+ banner: fileObj,
+});
+
+export function useRhf(init: Fund) {
+ const {
+ register,
+ handleSubmit,
+ control,
+ trigger,
+ resetField,
+ formState: { isSubmitting, errors, isDirty, dirtyFields },
+ } = useForm({
+ resolver: yupResolver(schema),
+ values: {
+ name: init.name,
+ description: init.description,
+ targetType:
+ init.target === "0"
+ ? "none"
+ : init.target === "smart"
+ ? "smart"
+ : "fixed",
+ fixedTarget: init.target === "smart" ? "" : init.target,
+ logo: { name: "", preview: init.logo, publicUrl: init.logo },
+ banner: { name: "", preview: init.banner, publicUrl: init.banner },
+ },
+ });
+
+ const { field: targetType } = useController({
+ control,
+ name: "targetType",
+ });
+
+ const { field: logo } = useController({ control, name: "logo" });
+ const { field: banner } = useController({ control, name: "banner" });
+
+ return {
+ register,
+ handleSubmit,
+ isSubmitting,
+ errors,
+ isDirty,
+ dirtyFields,
+ trigger,
+ resetField,
+ //controllers
+ targetType,
+ logo,
+ banner,
+ };
+}
diff --git a/src/pages/Funds/Fund.tsx b/src/pages/Funds/Fund.tsx
deleted file mode 100644
index 09b5fa0fb8..0000000000
--- a/src/pages/Funds/Fund.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import { useParams } from "react-router-dom";
-
-export function Component() {
- const params = useParams();
- return WIP: Fund: {params.fundId}
;
-}
diff --git a/src/pages/Funds/Fund/Body/Body.tsx b/src/pages/Funds/Fund/Body/Body.tsx
new file mode 100644
index 0000000000..87bd97d5ed
--- /dev/null
+++ b/src/pages/Funds/Fund/Body/Body.tsx
@@ -0,0 +1,61 @@
+import Breadcrumbs from "components/Breadcrumbs";
+import VerifiedIcon from "components/VerifiedIcon";
+import { appRoutes } from "constants/routes";
+import { useFundContext } from "../FundContext";
+import DonateButton from "./DonateButton";
+import GeneralInfo from "./GeneralInfo";
+
+export function Body() {
+ const p = useFundContext();
+
+ return (
+
+
+
+
+
+
+
+
+
+ {p.verified && (
+ {p.name}
+ {!p.active && (
+
+ closed
+
+ )}
+
+
+
+
+ {p.members.map((m) => `${m.id}:${m.name}`).join()}
+
+
+
+ info 1
+ info 2
+ info 3
+
+
+
+
+
+
+
+ );
+}
+
+function Balance(props: { title: string; amount: number }) {
+ return (
+
+
+ {props.title}
+
+
+ ${humanize(props.amount)}
+
+
+
+
+
+ {fund.description}
+
+
+
+
+
+ {expanded ? (
+ setOpen((prev) => !prev)}
+ />
+ )}
+ {isOpen && children}
+
+ );
+}
+
+type HeaderProps = {
+ classes?: string;
+ title: string;
+ children?: React.ReactNode;
+};
+
+function StaticHeader({ title, classes = "", children }: HeaderProps) {
+ return (
+
+ {title}
+ {children}
+
+ );
+}
+
+function Header(props: {
+ title: string;
+ isOpen: boolean;
+ onClick: () => void;
+}) {
+ return (
+
+
+
+
+ );
+}
diff --git a/src/pages/Funds/Fund/Body/index.ts b/src/pages/Funds/Fund/Body/index.ts
new file mode 100644
index 0000000000..bc83c678e5
--- /dev/null
+++ b/src/pages/Funds/Fund/Body/index.ts
@@ -0,0 +1 @@
+export { Body } from "./Body";
diff --git a/src/pages/Funds/Fund/FundContext.ts b/src/pages/Funds/Fund/FundContext.ts
new file mode 100644
index 0000000000..89a2135242
--- /dev/null
+++ b/src/pages/Funds/Fund/FundContext.ts
@@ -0,0 +1,14 @@
+import { isEmpty } from "helpers";
+import { createContext, useContext } from "react";
+import type { Fund } from "types/aws";
+
+export const FundContext = createContext({} as Fund);
+
+export const useFundContext = (): Fund => {
+ const val = useContext(FundContext);
+
+ if (isEmpty(Object.entries(val))) {
+ throw new Error("useFundContext should only be used inside FundContext");
+ }
+ return val;
+};
diff --git a/src/pages/Funds/Fund/PageError.tsx b/src/pages/Funds/Fund/PageError.tsx
new file mode 100644
index 0000000000..8c3321ce08
--- /dev/null
+++ b/src/pages/Funds/Fund/PageError.tsx
@@ -0,0 +1,18 @@
+import Icon from "components/Icon";
+import { appRoutes } from "constants/routes";
+import { Link } from "react-router-dom";
+
+export default function PageError() {
+ return (
+
+ Failed to load nonprofit profile
+
+ );
+}
diff --git a/src/pages/Funds/Fund/Skeleton.tsx b/src/pages/Funds/Fund/Skeleton.tsx
new file mode 100644
index 0000000000..93365e847f
--- /dev/null
+++ b/src/pages/Funds/Fund/Skeleton.tsx
@@ -0,0 +1,40 @@
+import ContentLoader from "components/ContentLoader";
+
+export default function Skeleton() {
+ return (
+
+
+
+ {/** header */}
+
+ {/** content */}
+
+
+ {/** balances */}
+
+
+
+ );
+}
+
+function Banner() {
+ return (
+
+ );
+}
+
+function Logo({ className = "" }) {
+ return (
+
+ );
+}
diff --git a/src/pages/Funds/Fund/index.tsx b/src/pages/Funds/Fund/index.tsx
new file mode 100644
index 0000000000..96db9fbb5a
--- /dev/null
+++ b/src/pages/Funds/Fund/index.tsx
@@ -0,0 +1,48 @@
+import fallback_banner from "assets/images/fallback-banner.png";
+import flying_character from "assets/images/flying-character.png";
+import Image from "components/Image";
+import Seo from "components/Seo";
+import { APP_NAME, BASE_URL } from "constants/env";
+
+import { skipToken } from "@reduxjs/toolkit/query";
+import { useParams } from "react-router-dom";
+import { useFundQuery } from "services/aws/funds";
+import { Body } from "./Body";
+import { FundContext } from "./FundContext";
+import PageError from "./PageError";
+import Skeleton from "./Skeleton";
+
+export function Component() {
+ const { fundId = "" } = useParams();
+ const { isLoading, isError, data } = useFundQuery(fundId || skipToken);
+
+ if (isLoading) return
+
+ );
+}
diff --git a/src/pages/Funds/common/GoalSelector.tsx b/src/pages/Funds/common/GoalSelector.tsx
new file mode 100644
index 0000000000..91c560fabf
--- /dev/null
+++ b/src/pages/Funds/common/GoalSelector.tsx
@@ -0,0 +1,37 @@
+import { Field, Label, Radio, RadioGroup } from "@headlessui/react";
+
+export type TargetType = "fixed" | "none" | "smart";
+
+const options: { [T in TargetType]: string } = {
+ smart: "Use smart milestones",
+ none: "No goal or progress bar",
+ fixed: "Set my own goal",
+};
+
+interface Props {
+ value: TargetType;
+ onChange: (type: TargetType) => void;
+ classes?: string;
+}
+export function GoalSelector(props: Props) {
+ return (
+
+ {Object.entries(options).map(([value, label]) => (
+
+
+
+ {label}
+
+ ))}
+
+ );
+}
diff --git a/src/pages/Funds/common/index.ts b/src/pages/Funds/common/index.ts
new file mode 100644
index 0000000000..fcf509e10b
--- /dev/null
+++ b/src/pages/Funds/common/index.ts
@@ -0,0 +1,13 @@
+import type { ImageMIMEType } from "types/lists";
+
+export * from "./GoalSelector";
+
+export const VALID_MIME_TYPES: ImageMIMEType[] = [
+ "image/jpeg",
+ "image/png",
+ "image/webp",
+ "image/svg+xml",
+];
+
+export const MAX_SIZE_IN_BYTES = 1e6;
+export const MAX_CHARS = 4000;
diff --git a/src/pages/Funds/index.tsx b/src/pages/Funds/index.tsx
index 2ce455c9bd..ca4c3f4069 100644
--- a/src/pages/Funds/index.tsx
+++ b/src/pages/Funds/index.tsx
@@ -7,6 +7,7 @@ export const fundsRoute: RouteObject = {
children: [
{ index: true, lazy: () => import("./Funds") },
{ path: ":fundId", lazy: () => import("./Fund") },
+ { path: ":fundId/edit", lazy: () => import("./EditFund") },
{ path: "new", lazy: () => import("./CreateFund") },
],
};
diff --git a/src/pages/UserDashboard/Funds/Funds.tsx b/src/pages/UserDashboard/Funds/Funds.tsx
new file mode 100644
index 0000000000..cce70aa63e
--- /dev/null
+++ b/src/pages/UserDashboard/Funds/Funds.tsx
@@ -0,0 +1,80 @@
+import ContentLoader from "components/ContentLoader";
+import Image from "components/Image";
+import QueryLoader from "components/QueryLoader";
+import { appRoutes } from "constants/routes";
+import { useAuthenticatedUser } from "contexts/Auth";
+import { Link } from "react-router-dom";
+import { useUserFundsQuery } from "services/aws/users";
+import type { UserFund } from "types/aws";
+
+export function Funds() {
+ const user = useAuthenticatedUser();
+ const query = useUserFundsQuery(user.email);
+ return (
+
+
My Fundraisers
+
+
+
+
+ );
+}
+
+const Fund = (props: UserFund) => (
+
+
+
{props.name}
+
+ {props.active ? "active" : "closed"}
+
+
+ edit
+
+
+ view
+
+
+
+ );
+}
diff --git a/src/pages/UserDashboard/Funds/index.ts b/src/pages/UserDashboard/Funds/index.ts
new file mode 100644
index 0000000000..0f4842aa81
--- /dev/null
+++ b/src/pages/UserDashboard/Funds/index.ts
@@ -0,0 +1 @@
+export { Funds as Component } from "./Funds";
diff --git a/src/pages/UserDashboard/UserDashboard.tsx b/src/pages/UserDashboard/UserDashboard.tsx
index 59580fe32a..0323dc629b 100644
--- a/src/pages/UserDashboard/UserDashboard.tsx
+++ b/src/pages/UserDashboard/UserDashboard.tsx
@@ -1,7 +1,7 @@
import { appRoutes } from "constants/routes";
import withAuth from "contexts/Auth";
import DashboardLayout from "layout/DashboardLayout";
-import type { RouteObject } from "react-router-dom";
+import { Outlet, type RouteObject } from "react-router-dom";
import Donations from "./Donations";
import EditProfile from "./EditProfile";
import Settings from "./Settings";
@@ -25,5 +25,10 @@ export const userDashboardRoute: RouteObject = {
{ path: routes.edit_profile, element: ({
+ invalidatesTags: ["funds", "fund"],
+ query: ({ id, ...payload }) => {
+ return {
+ url: `${v(1)}/funds/${id}`,
+ method: "PATCH",
+ body: payload,
+ headers: { authorization: TEMP_JWT },
+ };
+ },
+ }),
+ closeFund: builder.mutation({
+ invalidatesTags: ["funds", "fund", "user-funds"],
+ query: (fundId) => {
+ return {
+ url: `${v(1)}/funds/${fundId}/close`,
+ method: "POST",
+ headers: { authorization: TEMP_JWT },
+ };
+ },
+ }),
funds: builder.query({
+ providesTags: ["funds"],
query: (params) => {
return {
url: `${v(1)}/funds`,
@@ -24,6 +46,10 @@ export const funds = aws.injectEndpoints({
};
},
}),
+ fund: builder.query({
+ providesTags: ["fund"],
+ query: (fundId) => `${v(1)}/funds/${fundId}`,
+ }),
}),
});
@@ -31,5 +57,8 @@ export const {
useCreateFundMutation,
useLazyFundsQuery,
useFundsQuery,
+ useFundQuery,
+ useEditFundMutation,
+ useCloseFundMutation,
util: { updateQueryData: updateAwsQueryData },
} = funds;
diff --git a/src/services/aws/users.ts b/src/services/aws/users.ts
index 2d2432f39a..98b556a7b3 100644
--- a/src/services/aws/users.ts
+++ b/src/services/aws/users.ts
@@ -29,7 +29,7 @@ const endowAdmins = aws.injectEndpoints({
}),
}),
userFunds: builder.query({
- providesTags: ["user-endows"],
+ providesTags: ["user-funds"],
query: (userId) => ({
url: `/${v(3)}/users/${userId}/funds`,
headers: { authorization: TEMP_JWT },
diff --git a/src/types/aws/ap/index.ts b/src/types/aws/ap/index.ts
index 236e8303b7..d8e8715782 100644
--- a/src/types/aws/ap/index.ts
+++ b/src/types/aws/ap/index.ts
@@ -130,11 +130,12 @@ export type UserEndow = {
};
export interface UserFund {
- name?: string;
+ name: string;
logo: string;
email: string;
/** uuidv4 */
id: string;
+ active: boolean;
}
export interface EndowAdmin {
@@ -254,8 +255,8 @@ export interface Fund {
expiration?: string;
verified: boolean;
donation_total_usd: number;
- /** undefined: no target */
- target?: "smart" | `${number}`;
+ /** "0": no target */
+ target: "smart" | `${number}`;
/** endowIds that allows this fundraiser on their profile */
approvers: number[];
}
@@ -276,6 +277,14 @@ export namespace Fund {
members: number[];
}
+ export interface Update
+ extends Partial<
+ Pick<
+ Fund,
+ "name" | "description" | "banner" | "logo" | "featured" | "target"
+ >
+ > {}
+
export interface Card
extends Pick<
Fund,
From 8ff9dc59a1f9fe8acd559a72807dc6897f6bcfeb Mon Sep 17 00:00:00 2001
From: ap-justin <89639563+ap-justin@users.noreply.github.com>
Date: Sat, 3 Aug 2024 09:11:44 +0800
Subject: [PATCH 14/47] Chariot prod key requirements (#3198)
* 50 usd min amount
* summary skips
* create dedicated chariot checkout form
* use props namespace
* modal dismissible
* floor instead of ceil
* set min
* update test
---
src/components/donation/Steps/DonateMethods/Daf/Form.test.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/donation/Steps/DonateMethods/Daf/Form.test.tsx b/src/components/donation/Steps/DonateMethods/Daf/Form.test.tsx
index 1c09fd1972..10834e1f2c 100644
--- a/src/components/donation/Steps/DonateMethods/Daf/Form.test.tsx
+++ b/src/components/donation/Steps/DonateMethods/Daf/Form.test.tsx
@@ -93,7 +93,7 @@ describe("DAF form test", () => {
await userEvent.clear(amountInput);
await userEvent.type(amountInput, "-5");
- expect(screen.getByText(/minimum donation is \$50/i)).toBeInTheDocument();
+ expect(screen.getByText(/must be greater than 0/i)).toBeInTheDocument();
await userEvent.clear(amountInput);
await userEvent.type(amountInput, "50");
From e0bd7f79f6cd2daa3cd724943f400429025478e9 Mon Sep 17 00:00:00 2001
From: ap-justin <89639563+ap-justin@users.noreply.github.com>
Date: Mon, 12 Aug 2024 14:05:40 +0800
Subject: [PATCH 15/47] lint fix
---
.../Funds/Fund/Body/GeneralInfo/DetailsColumn/DetailsColumn.tsx | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/pages/Funds/Fund/Body/GeneralInfo/DetailsColumn/DetailsColumn.tsx b/src/pages/Funds/Fund/Body/GeneralInfo/DetailsColumn/DetailsColumn.tsx
index ea1a4e50a6..039d030897 100644
--- a/src/pages/Funds/Fund/Body/GeneralInfo/DetailsColumn/DetailsColumn.tsx
+++ b/src/pages/Funds/Fund/Body/GeneralInfo/DetailsColumn/DetailsColumn.tsx
@@ -1,8 +1,6 @@
-import { useFundContext } from "../../../FundContext";
import Balances from "./Balances";
export default function DetailsColumn({ className = "" }) {
- const p = useFundContext();
return (
From 43fdf8686a75a2897344de8c22a373eadcf7d0f9 Mon Sep 17 00:00:00 2001
From: ap-justin <89639563+ap-justin@users.noreply.github.com>
Date: Mon, 2 Sep 2024 21:14:21 +0800
Subject: [PATCH 16/47] revert linkedin
---
public/scripts/linkedin-tracking.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/scripts/linkedin-tracking.js b/public/scripts/linkedin-tracking.js
index d1262a0d8b..2b1e0f085b 100644
--- a/public/scripts/linkedin-tracking.js
+++ b/public/scripts/linkedin-tracking.js
@@ -1,4 +1,4 @@
-_linkedin_partner_id = "6373172";
+_linkedin_partner_id = "4969890";
window._linkedin_data_partner_ids = window._linkedin_data_partner_ids || [];
window._linkedin_data_partner_ids.push(_linkedin_partner_id);
From 0095b69d316b51ea9317ced517f375e1cb33a33b Mon Sep 17 00:00:00 2001
From: ap-justin <89639563+ap-justin@users.noreply.github.com>
Date: Wed, 4 Sep 2024 12:41:28 +0800
Subject: [PATCH 17/47] update icons
---
src/pages/Funds/EditFund/EditFund.tsx | 4 ++--
src/pages/UserDashboard/routes.ts | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/pages/Funds/EditFund/EditFund.tsx b/src/pages/Funds/EditFund/EditFund.tsx
index 8b26078520..2c2bcbfbce 100644
--- a/src/pages/Funds/EditFund/EditFund.tsx
+++ b/src/pages/Funds/EditFund/EditFund.tsx
@@ -31,7 +31,7 @@ export default withAuth(function EditFund({ user }) {
if (!user.funds.includes(fundId)) {
return (
);
@@ -40,7 +40,7 @@ export default withAuth(function EditFund({ user }) {
if (!data.active) {
return (
-
+
This fund is already closed
);
diff --git a/src/pages/UserDashboard/routes.ts b/src/pages/UserDashboard/routes.ts
index be1d7c2a1b..fd99a7edad 100644
--- a/src/pages/UserDashboard/routes.ts
+++ b/src/pages/UserDashboard/routes.ts
@@ -39,7 +39,7 @@ export const linkGroups: LinkGroup[] = [
title: "My fundraisers",
to: routes.funds,
icon: {
- type: "HeartFill",
+ type: "Heart",
size: 21,
},
},
From 661870cdd8cbc76cceb99c09b5607f264d28e024 Mon Sep 17 00:00:00 2001
From: ap-justin <89639563+ap-justin@users.noreply.github.com>
Date: Fri, 19 Jul 2024 20:05:38 +0800
Subject: [PATCH 18/47] Disable tracking in `/donate-widget` (#3163)
* move script to Seo component
* override seo in widget page
* remove duplicate route
* override when inside widget route
* donate widget override
---
src/pages/DonateWidget/DonateWidget.tsx | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/pages/DonateWidget/DonateWidget.tsx b/src/pages/DonateWidget/DonateWidget.tsx
index e5c02509cb..d90cadd203 100644
--- a/src/pages/DonateWidget/DonateWidget.tsx
+++ b/src/pages/DonateWidget/DonateWidget.tsx
@@ -1,5 +1,6 @@
import LoaderRing from "components/LoaderRing";
import QueryLoader from "components/QueryLoader";
+import Seo from "components/Seo";
import { ErrorStatus } from "components/Status";
import { idParamToNum } from "helpers";
import { useEffect } from "react";
@@ -44,6 +45,7 @@ export default function DonateWidget() {
}}
className="grid grid-rows-[1fr_auto] justify-items-center gap-10"
>
+
Date: Tue, 23 Jul 2024 10:20:21 +0800
Subject: [PATCH 19/47] Auth redirect (#3165)
* move hub to app
* use hub state instead of local storage
* convert to uncontrolled
* add isNpo flag
* password input autocomplete requirement
* autocomplete requirement
* state -> fromState
* state -> fromState
* trigger vaidation when clicking google signin
* move user type to top
* auth redirect
* add comment
---
src/index.tsx | 2 ++
src/pages/OAuthRedirector.tsx | 28 ++++++++++++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/src/index.tsx b/src/index.tsx
index 222ae50add..9bb4abd5a6 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -30,6 +30,8 @@ Amplify.configure(amplifyConfig);
const container = document.getElementById("root");
const root = createRoot(container as Element);
+Amplify.configure(amplifyConfig);
+
Sentry.init({
dsn: process.env.PUBLIC_SENTRY_DSN,
environment: process.env.PUBLIC_ENVIRONMENT,
diff --git a/src/pages/OAuthRedirector.tsx b/src/pages/OAuthRedirector.tsx
index 46e8fe4518..1c9f21177d 100644
--- a/src/pages/OAuthRedirector.tsx
+++ b/src/pages/OAuthRedirector.tsx
@@ -1,4 +1,5 @@
import LoaderRing from "components/LoaderRing";
+<<<<<<< HEAD
export default function OAuthRedirector() {
/**
@@ -14,4 +15,31 @@ export default function OAuthRedirector() {
classes={{ container: "w-32 place-self-center" }}
/>
);
+=======
+import { Navigate, useLocation } from "react-router-dom";
+import type { OAuthState } from "types/auth";
+
+export default function OAuthRedirector() {
+ const location = useLocation();
+
+ const state: OAuthState | null = location.state
+ ? JSON.parse(location.state)
+ : null;
+
+ /** when provider (`A.`) redirects back to our app thru `/oauth-redirector` it doesn't pass `state`
+ * `A.` - Amplify is configured in src/index.tsx
+ * App.tsx listens to `auth.customOAuthState` event and navigates to `/oauth-redirector`, this time with `state`
+ */
+ if (!state) {
+ return (
+
Date: Sat, 3 Aug 2024 09:11:44 +0800
Subject: [PATCH 21/47] Chariot prod key requirements (#3198)
* 50 usd min amount
* summary skips
* create dedicated chariot checkout form
* use props namespace
* modal dismissible
* floor instead of ceil
* set min
* update test
---
src/pages/OAuthRedirector.tsx | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/src/pages/OAuthRedirector.tsx b/src/pages/OAuthRedirector.tsx
index 1c9f21177d..46e8fe4518 100644
--- a/src/pages/OAuthRedirector.tsx
+++ b/src/pages/OAuthRedirector.tsx
@@ -1,5 +1,4 @@
import LoaderRing from "components/LoaderRing";
-<<<<<<< HEAD
export default function OAuthRedirector() {
/**
@@ -15,31 +14,4 @@ export default function OAuthRedirector() {
classes={{ container: "w-32 place-self-center" }}
/>
);
-=======
-import { Navigate, useLocation } from "react-router-dom";
-import type { OAuthState } from "types/auth";
-
-export default function OAuthRedirector() {
- const location = useLocation();
-
- const state: OAuthState | null = location.state
- ? JSON.parse(location.state)
- : null;
-
- /** when provider (`A.`) redirects back to our app thru `/oauth-redirector` it doesn't pass `state`
- * `A.` - Amplify is configured in src/index.tsx
- * App.tsx listens to `auth.customOAuthState` event and navigates to `/oauth-redirector`, this time with `state`
- */
- if (!state) {
- return (
-
* fix twitter acct handle used
* V3 endowment (#2941)
* BG-1225: Donation success page: Show the name of the nonprofit donor chose (#2869)
* Pass recipientName to DonateFiatThanks from PayPal checkout
* Pass recipientName in StripePaymentStatus
* Donate page: Create PayPal order (donation intent) only on button click (#2873)
* Add new 'intent' don. status
* Create PayPal order (donation intent) only on button click
* Remove redundant isSubmitting state
* Refactor createOrder
* Revert "Add new 'intent' don. status"
This reverts commit 54af8638beaf15ba61ad212a305c9fbd91b24734.
* UI Error handling (#2870)
Closes BG-1263
Closes BG-1172
This PR aims to separate UI error (UI is unusable, display fallback UI) from user-initiated error (e.g. failed submission, prompt with Modal). Kindly see comments for changes explanation
NOTE: renamings, moving of files are not applied yet so that essential changes would stand out.
- [ ] rename `useErrorContext` to `useErrorHandler`
- [ ] move `useErrorHandler` to `/hooks`
- [ ] delete `contexts/ErrorContext`
Sample handled UI errors:
App encountered error
* Code Restructuring and Refactoring for Homepage
Signed-off-by: Navansh
---------
Signed-off-by: Navansh
* Landing page fixes (#2899)
* misnamed image file
* dup wildcard route removed
* formatting and other cleanup fixes
* spelling fixes
* fixes for styles renaming
* fix DOM property naming typo
* blog posts use dapp URL and remove trailing slash
* fix links to marketplace & register page
* fix DAPP link to drop app if on prod
* remove commented out code
* revert svg changes from DOM prop fix
* revert svg changes from DOM prop fix
* lint fixes pt1
* footer updates
* fix hooks
* use for...of
* Follow up fixes (#2901)
* yarn gormat
* done lint
* fix failing test
* revert rename
* revert react namespace
* react namespace
* react namespace
---------
Co-authored-by: Andrey
Co-authored-by: ap-justin <89639563+ap-justin@users.noreply.github.com>
* Convert common arbitrary values to built in tailwind classes (#2902)
* misnamed image file
* dup wildcard route removed
* formatting and other cleanup fixes
* spelling fixes
* fixes for styles renaming
* fix DOM property naming typo
* blog posts use dapp URL and remove trailing slash
* fix links to marketplace & register page
* fix DAPP link to drop app if on prod
* remove commented out code
* revert svg changes from DOM prop fix
* revert svg changes from DOM prop fix
* yarn gormat
* lint fixes pt1
* done lint
* footer updates
* fix failing test
* fix hooks
* use for...of
* revert rename
* revert react namespace
* react namespace
* react namespace
* blog card classes
* delete unused
* done blog card bene carousel
* more fixes
* remove unused controls
* remove unused controls
* remove one time
* unused utils
* to tailwind
* to navy
* to tw util
* to tailwind
* to tailwind
* to tailwind
---------
Co-authored-by: Andrey
* `DAPP_URL` to `BASE_URL` fix (#2903)
* DAPP_URL >> BASE_URL
* format/lint fixes
---------
Co-authored-by: Andrey
* To tsx (#2904)
* to tsx
* dryner
* common media
* remove template
* remove custom classes
* remove brand classes
* redirect signins to marketplace, not to root (#2905)
Co-authored-by: Andrey
* temp hide landing page btns (#2915)
Co-authored-by: Andrey
* Static pages for legal (#2917)
* routes for new legal pages
* 3 legal pages copied from prod
* fix landing page footerlinks
---------
Co-authored-by: Andrey
* Home groupings (#2916)
* remove nested
* animations
* blog card
* move hero bottom
* hero bottom
* benefits
* testimonials
* move footer
* nav bar footer
* move button
* fix lint
* Scope custom classes, remove unused (#2919)
* move carousel styles
* remove svg animation
* to module
* remove benefits landing
* remove util
* remove app.css
* common css import
* Reuse layout (#2918)
* reuse layout
* remove unused import
* move v2 footer to app/footer along with depreciated landing header file; refactor newsletter to use new styles w/ v2 footer; fix footer links & copyright;
* remove unused import
* footer social links from constants file
* fix test
* watch sticky instead of scroll
* remove no effect
* links clean up: dropdown menu & nav logo
---------
Co-authored-by: Andrey
* BG-1243: create crypto intents on Checkout page load + confirm crypto intents on success (#2895)
* Create crypto intent on checkout load + confirm on tx success
* Use template string in TxSubmit
* Extract useCreateCryptoIntent
* Show 'Simulating tx...' when no transactionId is present
* Remove transactionId state
* Refactor
* Turn useCryptoIntentCreatorMutation into a query
* Revert change to ErrorContext
* Remove transformResponse from useConfirmCryptoIntentMutation
* Include tip in crypto tx estimation
* Rename totalAmount->grossAmount
* Legal pages updates (#2922)
* updates to legal pages
* change Link to anchor tag
* link component added to terms page
---------
Co-authored-by: Andrey
* Landing page fixes (#2921)
* reuse layout
* remove unused import
* move v2 footer to app/footer along with depreciated landing header file; refactor newsletter to use new styles w/ v2 footer; fix footer links & copyright;
* remove unused import
* footer social links from constants file
* fix test
* watch sticky instead of scroll
* remove no effect
* links clean up: dropdown menu & nav logo
* hero
* done section 2
* overflow
* move asset
* position chars move assets
* remove custom css
* embed color
* exact
* done benefits
* done brands
* video desktop
* animation
* alt
* spaces
* roundness
* file name
* move assets
* done testimonials
* done blogs
* done blog
* external screen classes
* testimonials overflow fix
* hero hero bottom transition
* done hero
* carousel blemish
* benefits blemish
* done animation
* page spacing
* increate bot padding
* blurs
* skeleton
* add padding
* grid footer
* responsive styles
* intercom hide
* remove unused images
* icon
* slider buttons
* blemish transition
* spacing
* footer spacing
* increase blur
* Update src/App/Header/index.tsx
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
---------
Co-authored-by: Andrey
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* overflow-x-hidden (#2923)
* hidden -> clip (#2924)
* BG tip - copy changed
* donation split copy changed
* split - patch for non-widgetConfig scenario
* temp removal of paypal btns from checkout (#2926)
* temp removal of paypal btns from checkout
* fix build
---------
Co-authored-by: Andrey
* copy fixes: Widget >> Donation Form
* swap in Laira mascot img
* adjust schema
* move program creator
* milestone
* remoev initial
* new program form
* new program update type
* fxi type error
* update delete
* done program editor
* add deafult value
* milestone buttons
* test change
* usesubmit only
* git reset
* remove mb-2
* create program
* add milestone
* delete method
* revert to program editor
* form before clean
* revert name
* back to defaultVals
* use values
* switch to v8 endowment
* update endpoint algolia
* registration-update
* bump endpoint versions
* crypto intent ver
* bump version
* wise error display
---------
Signed-off-by: Navansh
Co-authored-by: Nenad Misic
Co-authored-by: Juan Paolo Mariano <65009749+jp-mariano@users.noreply.github.com>
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
Co-authored-by: Andrey
Co-authored-by: Navansh
* Rolled back stripe donation endpoint (#2944)
* up version (#2945)
* Update deps (#2948)
* update biome and amplify
* update stripe and other minor
* rest minor
* update package manager
* revert test
* BG-1307 GDPR Banner (#2946)
* GDPR banner for non-essential cookies/trackers
* transfer to module
---------
Co-authored-by: Andrey
Co-authored-by: ap-justin
* Rolled back crypto-donation endpoint (#2950)
* BG-1312: Nonprofits page (#2951)
* done hero
* increase padding
* nonprofit info
* done why bg
* brands content
* extract benefits content
* done benefits
* new braands
* done fiscal sponsorship
* move testimonial content
* done testimonials
* bottom cta done
* correct copy
* donor info link
* update vitest
* BG-1320 Homepage fixes (#2943)
* loader color
* brand img explicit height
* tally explicit height
* endow card explicit height
* testimonial card epxlict height
* base layout
* path bg
* Testimonials fixes to copy for punctuation and other typos/errors (#2947)
Co-authored-by: Andrey
* Carousel cards mixed up (#2949)
Co-authored-by: Andrey
* format
* fix cherrypick
* cherry fix
* detail fixes
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* BG-1326 Fallback Image updated (#2952)
* flying character used as fallback for logo/card img everywhere
* new img
* BG-1311: Donor info page (#2953)
* done hero
* increase padding
* nonprofit info
* done why bg
* brands content
* extract benefits content
* done benefits
* new braands
* done fiscal sponsorship
* move testimonial content
* done testimonials
* bottom cta done
* correct copy
* donor info link
* update vitest
* BG-1320 Homepage fixes (#2943)
* loader color
* brand img explicit height
* tally explicit height
* endow card explicit height
* testimonial card epxlict height
* base layout
* path bg
* Testimonials fixes to copy for punctuation and other typos/errors (#2947)
Co-authored-by: Andrey
* Carousel cards mixed up (#2949)
Co-authored-by: Andrey
* format
* fix cherrypick
* cherry fix
* detail fixes
* done hero
* move hero bottom
* benefits abstract
* benefits section
* done cta
* cta text
* add donors link
* delete
* move img
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Added JWT to registration update endpoint (#2954)
* update endpoints (#2955)
* BG-1327 Banner fallback (#2966)
* fallback banner added for profile
* admin logo fallback to character
* Get user attributes from DB instead of cognito (#2967)
* session loader
* update types
* formatted
* remove unused
* remove duplicate check
* env
* User dashboard (#2968)
* common layout
* rename sidebar header
* move sidebar header
* factor out header
* fix layout
* user dashboard
* capitalize
* copy settings page
* edit profile page
* dashborad link
* create update action
* BG-1331: Move donate page inside user dashboard (#2970)
* convert to container query
* move donations to user dashboard
* dont show icon on dashbaord
* revert hide icon
* Implement share in stripe success page (#2972)
* add recipientId
* extract share
* use extracted
* BG-1333 T&C for Widgets (#2973)
* Basic T&C added to bottom of Widget + Config preview
* simplify widget terms to remove name
* move T&C to Content component to access queried profile object
* add intent as old (#2977)
* add unsupported chainId
* skip estimation
* token option
* crypto qr submit
* update copier api
* add direct mode
* direct option
* receiver addr
* change copy (#2990)
* BG-1341 Widget adaptations (#2976)
* hide lines in summary screen when related amounts are 0 (or tipping is disabled)
* Stock & DAF donations can set BG tip & split %
* Add SF fund explainer and Laira character to Summary view
* Address PR feedback
* tweak summary info shown w/ Tip/SF logic
* BG-1346 Donation Builder: style fixes and design improvement (#2989)
* design/style changes to donation form builder
* span >> div
* tweak styles for padding & alignment on smaller screen layout
* Address PR feedback
* Nonprofits page improvs (#2991)
* change hero img
* remove old hero img
* add laira imgges
* remove waiving char
* use latest waiving char
* replace waiving laira
* replace icon with laira
* why bg icons
* sf benefits content
* formatting
* replace waving (#2992)
* Donor page changes (#2993)
* replace waving
* repalce hero image
* use sf assets
* delete unused
* laira icons
* benefits order
* fixes for testimonals
* remove unused file (missed in orig merge)
* Home fixes (#2995)
* remove unused
* replace wavenly with core
* change brands heading
* add spacing
* remove unused module
* Donate form screen short carousel (#2997)
* remove unused
* new screen shots
* create carousel
* use new carousel
* fix size
* remove unusd
* Remove Leaderboard (#2996)
* remove unused leaderboard code & tests
* remove additional Leaderboard items
* add small padding to bottom of SF msg so doesn't run into payment form (#2998)
* Bg 1343 - move tip opt out to settings (#2999)
* update types
* move component
* fix type error
* Incrementors adapted to work with all currencies (#3004)
* BG-1350 ComplyDog sans Quill (#3005)
* complydog JS sans Quill
* use local script instead of hitting complydog's server
* BG-1344: Program donate checkbox (#3003)
* add prog type
* prog disable checkbox
* retrive attribute
* correct endpoints (#3000)
* rename variable
* Donation state handling (#3002)
* local state
* improve shape
* apply new types
* save
* widget content
* doante state to be constructed inside
* use intent instead
* remove reducer
* state shape
* crypto sender
* hello
* tip format
* clearer state
* merge or replace
* working fiat intent
* remove redundant
* remove unwanted
* add mode
* to switch
* fixes
* daf and stocks doesnt skip
* add loader
* remoev unused comment
* convert widget slice to plain state
* set init state instead
* skip split
* remove comment
* remove unsed
* resume no longer need intermediary donation loader page
* info comment
* add recipientId
* apply skips on back
* revert crypto checkout
* revert stripe checkout
* revert stripe checkout
* tx submit loading
* reset tip on token change
* change comment loctin
* tip back to donate form if skipped
* revert rename
* remove unsed comment
* remove unused omit
* verbose comment
* revert optional
* remove intent after loading
* fetch hide tip config
* info
* split desc
* testimonial copy fixes (#3007)
* BG-1357: DB Split settings (#3008)
* render slider
* split fix flag
* fix check field
* change type and adjust (#3006)
* add in donation state
* mix db value to widget value
* add label
* revert mixup
* standalone source attr
* format
* revert for endow option
* take inverse
* fee corrected & copy updates in Admin Settings (#3016)
* Payout min edit UI (#3015)
* update type and add field
* add placeholder
* add spacing
* Methods widget config (#3017)
* add method types
* donate methods widget config
* remove unused
* order configurer component
* format
* error message
* error msg
* fix bug
* no need for whole mthod
* revert smaple
* error msg
* Donate methods admin setting (#3018)
* move comp and helper
* sort
* reuse in settings page
* doante page use setting
* update link (#3009)
* swap tab name (#3019)
* distinguish supported/unsupported
* qr token type
* format
* switch to chainId map
* reverts
* generic donate thanks
* add spacing
* create intent on direct donation
* add space
* rename
* remove as const
* format
* Add lefthook git hooks (#3020)
* lefthook install and config
* hello world
* hello world
* add glob
* ehello world
* x
* x
* test
* test
* test
* testunused
* testunused
* Endow videos UI (#3021)
* media endpoints
* use v1
* media page and route
* container and header
* featured video container
* video adder modal
* show modal
* add video wiring
* paginated videos
* edit pros
* video preview
* videos nested
* adder to edidtor
* update payload
* init params
* responsive video
* toggle featured
* increase card per row
* add disabled
* pagination limit
* render videos in profile
* edit albel
* BG-1374: admin settings tweaks (#3033)
* 5 rows
* separator heading
* move payout minimum
* remove unused
* switch from Algolia >> CloudSearch (#3034)
* Widget custom title and description (#3035)
* udpate checkfield style
* parse description in widget page
* add onChange check field
* title and description fields
* show fallback if empty
* get recipient addr
* revert additional wallets
* direct button primary accent
---------
Signed-off-by: Navansh
Co-authored-by: Nenad Misic
Co-authored-by: Andrey
Co-authored-by: Juan Paolo Mariano <65009749+jp-mariano@users.noreply.github.com>
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
Co-authored-by: Navansh
* Program metrics (#3041)
* add new attributes
* target raise edit field
* program tally
* targetRaise is nullable
* unset targetRaise
* Update src/pages/Admin/Charity/ProgramEditor/ProgramInfo/ProgramInfo.tsx
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* nav dropdown label fixes
* BG-1381: Program selector in widget (#3049)
* export program selector
* load everythig
* add in snippet program id
* add prog field
* parse program id
* program initial state widget
* add on loaded
* update stocks schema
* update stocks schema
* remove unused
* ignore lint
* preview selected program
* BG-1383 BG-1384 minor fixes (#3051)
* User bookmarks (#3052)
* remove old type
* bookmarks update
* bookmarks btn
* bookmarks list
* bookmarks lists
* userId from jwt
* favorite -> profile
* update endpoints
* Header search V1 (#3054)
* convert to input
* show on focus
* update styles
* remain open when hovered
* marketplace context
* convert to context
* remoev log
* marketplace flag
* endowments search
* unitialized as loading
* separate search component
* search dropdown component
* propagate search to marketplace
* link home and marketplace query
* debounce happens in useCards
* BG-1385 WP Plugin doc page (#3053)
* WP Plugin Documentation page
* remove import
* clean up table
* address PR feedback
* fix typo
* add top countries (#3065)
* HOTFIX: switch to AWS WP server
* HOTFIX: WP server - HTTPS
* WP API updated
* Revert "WP API updated"
This reverts commit 402c3d5b7161c68616482fc5a5e63839f1ba58ff.
* Update deps (#3066)
* batch one updates
* update deps
* replace iwth write
* BG-1393: UK aid UI (#3068)
* batch one updates
* update deps
* replace iwth write
* uk fields
* shown checkbox not crypto
* form donor and server format
* change format
* donor address apes
* add annotation
* Update src/components/donation/Steps/Summary/DonorForm.tsx
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Display top countries (#3070)
* endpoint
* top countries data-access
* new chains integrated (#3080)
* new chains updated
* add chains to other types
* update rest of token/chain items; add stargaze/kujira testnets;
* add new chains to keplr wallet
* BG-1390: Cards v2 (#3081)
* remove implicit fields
* card content
* bookmark btn improvement
* link and button within card
* bookmark btn optimistic update
* comments
* fix arg
* remove decimal
* Custom tokens UI (#3069)
* coin gecko query
* token search component
* add name and logo
* add coingecko platformId
* add static list
* temp remove queyr
* warning
* use fuse for search
* remove coins
* max size
* init token not required
* add example
* file size
* proceed button
* dont format json
* set as token
* ignore json
* no need for amount
* remoev custom solana xrp
* platformId
* udpate coins
* usd rate
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Chain selector (#3082)
* add logos
* chain combobox
* use new chain selector
* option chainId to chainId
* value chainId
* Osmosis support added (#3084)
* add osmosis chains
* post-fix 'Testnet' to unsupported chain name (when applicable)
* Headless UI v2 (#3085)
* headless ui
* done batch one
* done coutnries
* done batch two
* done batch 3
* done batch 4
* chain selector scroller click
* token options scroll click fix
* max height
* remove extra border
* downgrade yarn
* fix program hidden
* combobox null value
* 2.1.0 transition built in dialog
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Add coinbase extension wallet (#3087)
* update icons
* use 6963 and add coinbase
* update icon imports
* unload after switching error
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* QR copy (#3088)
* add QR warning
* more readable
* In honor of field (#3089)
* honor field
* set from intent
* closer to label
* close to lable
* rename form
* wiring
* Fix token selector search and updates (#3091)
* combobox inside popover
* search icon on right
* rename interface
* BG-1417: Cheque FAQ (#3105)
* add content
* faq content
* BG-1423: chain selector updates (#3104)
* change type and adjust for chainId ''
* shorter
* sort chains
* display and focus on error
* Network dropdown bug fixes (#3106)
* add immediate to open on focus
* remove hidden input
* WP url updated
* BG-1424: Improve token search (#3102)
* add not listed
* mixed
* virtualized
* per chain json file
* biome ignore
* add missing
* add token placeholder
* spacing
* Revert "WP url updated"
This reverts commit ffb68148308d6078a762e0741cc779814c854ff2.
* upgrade to signclient (#3103)
* Network select should focus first when all is error (#3109)
* more flexible api
* use new api
* selector value is chainId
* remove hookform context
* Donate crash + cherry pick from master (#3108)
* make default values required
* remove undefined
* remove placeholder (#3039)
* BG-1380: share fixes (#3040)
* remove excess
* lines and punctuations
* handles and notes
* BG-1382: Users unable to create programs occasionally (#3050)
* fetch new token
* comment
* refresh token every 5 minutes
* add ms multiplier (#3067)
* HOTFIX: switch to AWS WP server
* HOTFIX: WP server - HTTPS
* WP API updated
* Revert "WP API updated"
This reverts commit 3ecb5d0958a5645a1ddda2d2d6284883362c13d9.
* fix source (#3083)
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Crypto form integration test (#3110)
* init test and mocks
* persisted state
* empty form validation msgs
* prior to selecting token
* error correcting
* remove test id
* BG-1399: Stripe status handling for manual bank verification (#3107)
* Update stripe payment status API to use latest version
* Added verify bank account button to 'pending' tab in My Donations
* Add 'arrivalDate' in Donations Thanks page
* Donation Thanks Page for 'requires_action' status and logged in donor
* Show bank verification link for guest donors on thank you page
* Removed redundant comment
* Renamed 'Verify Bank Account' to 'Action'
* Removed unused import
* Add type def for specific bank verification fields
* Add wordpress assets to post page (#3090)
* add in public assets and load via react helmet
* remove extra space
* dry input
* preserve header and footer style
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Stripe form integration test (#3111)
* update currency selector with accessible headless components
* extract rhf from field
* no rhf stripe form
* add missing error
* rhf hook
* rhf
* should focus
* init setup
* prefilled state
* validation test and increments
* stripe form loading and error
* Node proxies (#3113)
* optimism proxy
* revert mistake
* base proxy
* terra proxies
* stargaze and juno, compress lcd,rpc to nodeUrl
* osmosis
* kujira
* update terra
* Add 'ukGiftAid' field in fiat donation payload (#3121)
* WP URL updated
* Cover processing fee UI (#3112)
* processing fees
* fee allowance on intent
* fix type errors
* fee allowance checkbox
* flatten
* save as fee allowance instead of bool
* processing fee row
* fee allowance row
* remove console log
* add fee allowance to estimate gross amount
* add to deps list
* tip doesnt disable processign fee
* total include processing fee
* parent set border child set individual padding
* no need for custom bottom margin
* psersistend state doesnt drive UI show
* fix ts error
* Copy tweak
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* BG-1437: Tribute notif UI (#3122)
* fix: pass type
* form elements
* schema and field sizing
* remove unused import
* init tribute
* stripe checkout tribute wiring
* wiring crypto
* fix spacing
* fix initial size of
* msg char counter
* FIX: header footer styles (#3124)
* only apply wp override in /blog
* only apply wp override on /blog
* only to blog/:slug
* stocks form test (#3126)
* Async chain (#3123)
* update definition and adjust consumers
* cached get chain options
* use token definition
* only pick subset
* actual url
* New donations table fields (#3125)
* Update '/ap/donations.ts' types with new fields
* Fix 'Action' column for fiat bank verification url in mobile table
* Fix 'Action' column for fiat bank verification url in donations table
* Added 'Recurring' column for donor My Donations tables
* Added 'Direct Donation' and 'SF Donation' columns for donor My Donations tables
* Added 'appUsed' in nonprofit My Donations table
* Added 'paymentMethod' in nonprofit My Donations table
* Added 'isRecurring' in nonprofit My Donations table
* Single csv report
* Add other fields into nonprofit Donations table
* Fix 'Load More' button to span full width of table
* DAF form test + MSW mocking (#3127)
* add msw
* done crypto using msw
* done incrementers
* stocks test use msw
* fix fetch error
* fix build
* DAF form test
* Add staging endpoint for S3 file uploading (#3139)
* Donate steps - test skips and resets (#3128)
* add msw
* done crypto using msw
* done incrementers
* stocks test use msw
* fix fetch error
* fix build
* DAF form test
* test skips
* tip reset
* fix steps test
* fix copier warning
* remove mock
* change donation method
* remove unused
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* compress images and use webp format (#3140)
* Stripe checkout test - error paths (#3141)
* add msw
* done crypto using msw
* done incrementers
* stocks test use msw
* fix fetch error
* fix build
* DAF form test
* test skips
* tip reset
* fix steps test
* fix copier warning
* remove mock
* change donation method
* remove unused
* client secret loading
* by test id
* separate file
* error
* error modals
* donate btn
* remove debug
* UI updates (#3142)
* rounded widget form
* common donor terms
* reuse in preview
* update words
* revert order
* BG-1452: CC always goes along with DAF (#3145)
* tooltip detail
* cc locking
* append stripe if applicable
* add cc if daf && no cc
* Summary form integration test (#3146)
* factor out selector
* no form context field and selector
* native checkfield
* keep description
* add accessible error message
* uk gift aid test
* done tribute fields
* top level
* Payment tab label: card >> card/bank
* init lock (#3147)
* Update donations tables (#3144)
* Renamed 'SF Donation' to 'Donation to Sustainability Fund' for donor donations table
* Renamed 'SF Donation' to 'Donation to Sustainability Fund' for NPO donations table
* Renamed 'SF Donation' to 'Donation to Sustainability Fund' for NPO csv file
* Set fill function as new 'replaceWithEmptyString' helper function
* Updated csv file fields for donor donations
* Updated payment method values for NPO donations table and csv file
* Changed csv value for 'Donation Origin' to be the same with corresponding NPO donation table column
* Set 'Finish Paying' column name to 'Action' for donor intent table
* Removed excess '- - -' which consumes 1 column for intent and finalized donor tabs
* Set bank verification url action as a button
* Update 'Network' column to 'Donation Type' column for donor donations table
* Display date in csv file as it appears in respective donation tables for donor and NPO
* Display amounts in csv files to 2 decimal places - both NPO and donor tables
* Deleted unused 'paymentMethod' helper function and rolled back changes to NPO donations table for donation type
* Update column name 'Network' to 'Donation Type' for donor donations table csv
* Set 'Finish Paying' column name to 'Action' for donor intent mobile table
* Summary step integration test (#3148)
* coin gecko mock handlers
* test rows
* auth cases
* descripbe name
* use waitFor instead
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Alerts opt out (#3149)
* settings route
* detailed endows endpoint
* userId
* alert row
* submit handler
* query
* reuse in endowment link
* default checked
* update wiring
* bump to v3
* add success prompt
* preserve bookmark link
* correct route
* Update src/pages/UserDashboard/Settings/Settings.tsx
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Update src/pages/UserDashboard/Settings/Settings.tsx
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Update src/pages/UserDashboard/Settings/EndowAlertForm.tsx
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* lint fix
* spacing
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* endow admin object
* handle overflow
* bump v2
---------
Signed-off-by: Navansh
Co-authored-by: Nenad Misic
Co-authored-by: Juan Paolo Mariano <65009749+jp-mariano@users.noreply.github.com>
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
Co-authored-by: Navansh
* Terms move from page to checkout (#3160)
* t&c in each checkout screen
* remove in /donate page
* donate widget page remove
* widget preview remove
* remove unused
* remove unused import
* donation terms move closer
* temp hide UK GiftAid checkbox (#3161)
* temp hide UK GiftAid checkbox
* temp disable UK GiftAid Tests
---------
Signed-off-by: Navansh
Co-authored-by: Nenad Misic
Co-authored-by: Juan Paolo Mariano <65009749+jp-mariano@users.noreply.github.com>
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
Co-authored-by: Navansh
* v2.4.2 (#3181)
* Disable tracking in `/donate-widget` (#3163)
* move script to Seo component
* override seo in widget page
* remove duplicate route
* override when inside widget route
* donate widget override
* `Login` consistency (#3164)
* login consistency
* vitest upgrade
* Auth redirect (#3165)
* move hub to app
* use hub state instead of local storage
* convert to uncontrolled
* add isNpo flag
* password input autocomplete requirement
* autocomplete requirement
* state -> fromState
* state -> fromState
* trigger vaidation when clicking google signin
* move user type to top
* auth redirect
* add comment
* protected redirects to signup (#3178)
* No edit name (#3177)
* disable and add tooltip
* bump version
* use prompts instead (#3179)
* Program info in summary (#3180)
* accept program
* render program
* provide program value
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Bg1489 faqs (#3183)
* Email bugs (#3184)
* switch to no cors: verified to be still running
* move override further down
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* don't load static tokens on unsupported (no infra) chain (#3193)
* fix: admin pages reloading on navigation (#3195)
* update linkedin tracker (#3199)
* v2.4.3 (#3205)
* DAF Checkout with chariot (#3143)
* Update tsconfig (#3038)
* update tsconfig
* update type import
* dont include type automatically
* Program donation dropdown (#3037)
* add program attribute
* update programId
* add program selector on stripe
* add program selector in crypt oform
* daf program selector
* stocks program selector
* absolute dropdown
* add programId in intent creation
* incrementers wrap
* add program flag
* UI flagged
* update tsconfig
* update type import
* dont include type automatically
* prepend general
* use programAllowed flag
* rename constant
* BG-1336: Donate to ap wallet directly (#2978)
* Update Polygon and Ethereum testnets to Amoy and Sepolia (#2937)
* Update Polygon and Ethereum testnets to Amoy and Sepolia
* Format
* BG-1253: Pending Payment donation pickup button (#2940)
* Add 'Finish Paying' to intent table
* Remove redundant endowment fields from Donate page
* Add logic to load intent data into Donate page
* Update intent type to include token + currency + frequency
* Use Currency instead of DetailedCurrency
* Update frequency to 'one-time'+'subscription'
* Show tip as pct
* Remove tx hash column on awaiting payment table
* Reset state.transactionId on component unmount
* Pass transactionId when creating intents
* Pass old intent id in PayPal
* Update endpoint
* Rename intentTransactionId->oldTransactionId
* Add comment
* Rename intentTransactionId->oldTransactionId
* link / col header fixes
---------
Co-authored-by: Andrey
* fix twitter acct handle used
* V3 endowment (#2941)
* BG-1225: Donation success page: Show the name of the nonprofit donor chose (#2869)
* Pass recipientName to DonateFiatThanks from PayPal checkout
* Pass recipientName in StripePaymentStatus
* Donate page: Create PayPal order (donation intent) only on button click (#2873)
* Add new 'intent' don. status
* Create PayPal order (donation intent) only on button click
* Remove redundant isSubmitting state
* Refactor createOrder
* Revert "Add new 'intent' don. status"
This reverts commit 54af8638beaf15ba61ad212a305c9fbd91b24734.
* UI Error handling (#2870)
Closes BG-1263
Closes BG-1172
This PR aims to separate UI error (UI is unusable, display fallback UI) from user-initiated error (e.g. failed submission, prompt with Modal). Kindly see comments for changes explanation
NOTE: renamings, moving of files are not applied yet so that essential changes would stand out.
- [ ] rename `useErrorContext` to `useErrorHandler`
- [ ] move `useErrorHandler` to `/hooks`
- [ ] delete `contexts/ErrorContext`
Sample handled UI errors:
App encountered error
* Code Restructuring and Refactoring for Homepage
Signed-off-by: Navansh
---------
Signed-off-by: Navansh
* Landing page fixes (#2899)
* misnamed image file
* dup wildcard route removed
* formatting and other cleanup fixes
* spelling fixes
* fixes for styles renaming
* fix DOM property naming typo
* blog posts use dapp URL and remove trailing slash
* fix links to marketplace & register page
* fix DAPP link to drop app if on prod
* remove commented out code
* revert svg changes from DOM prop fix
* revert svg changes from DOM prop fix
* lint fixes pt1
* footer updates
* fix hooks
* use for...of
* Follow up fixes (#2901)
* yarn gormat
* done lint
* fix failing test
* revert rename
* revert react namespace
* react namespace
* react namespace
---------
Co-authored-by: Andrey
Co-authored-by: ap-justin <89639563+ap-justin@users.noreply.github.com>
* Convert common arbitrary values to built in tailwind classes (#2902)
* misnamed image file
* dup wildcard route removed
* formatting and other cleanup fixes
* spelling fixes
* fixes for styles renaming
* fix DOM property naming typo
* blog posts use dapp URL and remove trailing slash
* fix links to marketplace & register page
* fix DAPP link to drop app if on prod
* remove commented out code
* revert svg changes from DOM prop fix
* revert svg changes from DOM prop fix
* yarn gormat
* lint fixes pt1
* done lint
* footer updates
* fix failing test
* fix hooks
* use for...of
* revert rename
* revert react namespace
* react namespace
* react namespace
* blog card classes
* delete unused
* done blog card bene carousel
* more fixes
* remove unused controls
* remove unused controls
* remove one time
* unused utils
* to tailwind
* to navy
* to tw util
* to tailwind
* to tailwind
* to tailwind
---------
Co-authored-by: Andrey
* `DAPP_URL` to `BASE_URL` fix (#2903)
* DAPP_URL >> BASE_URL
* format/lint fixes
---------
Co-authored-by: Andrey
* To tsx (#2904)
* to tsx
* dryner
* common media
* remove template
* remove custom classes
* remove brand classes
* redirect signins to marketplace, not to root (#2905)
Co-authored-by: Andrey
* temp hide landing page btns (#2915)
Co-authored-by: Andrey
* Static pages for legal (#2917)
* routes for new legal pages
* 3 legal pages copied from prod
* fix landing page footerlinks
---------
Co-authored-by: Andrey
* Home groupings (#2916)
* remove nested
* animations
* blog card
* move hero bottom
* hero bottom
* benefits
* testimonials
* move footer
* nav bar footer
* move button
* fix lint
* Scope custom classes, remove unused (#2919)
* move carousel styles
* remove svg animation
* to module
* remove benefits landing
* remove util
* remove app.css
* common css import
* Reuse layout (#2918)
* reuse layout
* remove unused import
* move v2 footer to app/footer along with depreciated landing header file; refactor newsletter to use new styles w/ v2 footer; fix footer links & copyright;
* remove unused import
* footer social links from constants file
* fix test
* watch sticky instead of scroll
* remove no effect
* links clean up: dropdown menu & nav logo
---------
Co-authored-by: Andrey
* BG-1243: create crypto intents on Checkout page load + confirm crypto intents on success (#2895)
* Create crypto intent on checkout load + confirm on tx success
* Use template string in TxSubmit
* Extract useCreateCryptoIntent
* Show 'Simulating tx...' when no transactionId is present
* Remove transactionId state
* Refactor
* Turn useCryptoIntentCreatorMutation into a query
* Revert change to ErrorContext
* Remove transformResponse from useConfirmCryptoIntentMutation
* Include tip in crypto tx estimation
* Rename totalAmount->grossAmount
* Legal pages updates (#2922)
* updates to legal pages
* change Link to anchor tag
* link component added to terms page
---------
Co-authored-by: Andrey
* Landing page fixes (#2921)
* reuse layout
* remove unused import
* move v2 footer to app/footer along with depreciated landing header file; refactor newsletter to use new styles w/ v2 footer; fix footer links & copyright;
* remove unused import
* footer social links from constants file
* fix test
* watch sticky instead of scroll
* remove no effect
* links clean up: dropdown menu & nav logo
* hero
* done section 2
* overflow
* move asset
* position chars move assets
* remove custom css
* embed color
* exact
* done benefits
* done brands
* video desktop
* animation
* alt
* spaces
* roundness
* file name
* move assets
* done testimonials
* done blogs
* done blog
* external screen classes
* testimonials overflow fix
* hero hero bottom transition
* done hero
* carousel blemish
* benefits blemish
* done animation
* page spacing
* increate bot padding
* blurs
* skeleton
* add padding
* grid footer
* responsive styles
* intercom hide
* remove unused images
* icon
* slider buttons
* blemish transition
* spacing
* footer spacing
* increase blur
* Update src/App/Header/index.tsx
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
---------
Co-authored-by: Andrey
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* overflow-x-hidden (#2923)
* hidden -> clip (#2924)
* BG tip - copy changed
* donation split copy changed
* split - patch for non-widgetConfig scenario
* temp removal of paypal btns from checkout (#2926)
* temp removal of paypal btns from checkout
* fix build
---------
Co-authored-by: Andrey
* copy fixes: Widget >> Donation Form
* swap in Laira mascot img
* adjust schema
* move program creator
* milestone
* remoev initial
* new program form
* new program update type
* fxi type error
* update delete
* done program editor
* add deafult value
* milestone buttons
* test change
* usesubmit only
* git reset
* remove mb-2
* create program
* add milestone
* delete method
* revert to program editor
* form before clean
* revert name
* back to defaultVals
* use values
* switch to v8 endowment
* update endpoint algolia
* registration-update
* bump endpoint versions
* crypto intent ver
* bump version
* wise error display
---------
Signed-off-by: Navansh
Co-authored-by: Nenad Misic
Co-authored-by: Juan Paolo Mariano <65009749+jp-mariano@users.noreply.github.com>
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
Co-authored-by: Andrey
Co-authored-by: Navansh
* Rolled back stripe donation endpoint (#2944)
* up version (#2945)
* Update deps (#2948)
* update biome and amplify
* update stripe and other minor
* rest minor
* update package manager
* revert test
* BG-1307 GDPR Banner (#2946)
* GDPR banner for non-essential cookies/trackers
* transfer to module
---------
Co-authored-by: Andrey
Co-authored-by: ap-justin
* Rolled back crypto-donation endpoint (#2950)
* BG-1312: Nonprofits page (#2951)
* done hero
* increase padding
* nonprofit info
* done why bg
* brands content
* extract benefits content
* done benefits
* new braands
* done fiscal sponsorship
* move testimonial content
* done testimonials
* bottom cta done
* correct copy
* donor info link
* update vitest
* BG-1320 Homepage fixes (#2943)
* loader color
* brand img explicit height
* tally explicit height
* endow card explicit height
* testimonial card epxlict height
* base layout
* path bg
* Testimonials fixes to copy for punctuation and other typos/errors (#2947)
Co-authored-by: Andrey
* Carousel cards mixed up (#2949)
Co-authored-by: Andrey
* format
* fix cherrypick
* cherry fix
* detail fixes
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* BG-1326 Fallback Image updated (#2952)
* flying character used as fallback for logo/card img everywhere
* new img
* BG-1311: Donor info page (#2953)
* done hero
* increase padding
* nonprofit info
* done why bg
* brands content
* extract benefits content
* done benefits
* new braands
* done fiscal sponsorship
* move testimonial content
* done testimonials
* bottom cta done
* correct copy
* donor info link
* update vitest
* BG-1320 Homepage fixes (#2943)
* loader color
* brand img explicit height
* tally explicit height
* endow card explicit height
* testimonial card epxlict height
* base layout
* path bg
* Testimonials fixes to copy for punctuation and other typos/errors (#2947)
Co-authored-by: Andrey
* Carousel cards mixed up (#2949)
Co-authored-by: Andrey
* format
* fix cherrypick
* cherry fix
* detail fixes
* done hero
* move hero bottom
* benefits abstract
* benefits section
* done cta
* cta text
* add donors link
* delete
* move img
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Added JWT to registration update endpoint (#2954)
* update endpoints (#2955)
* BG-1327 Banner fallback (#2966)
* fallback banner added for profile
* admin logo fallback to character
* Get user attributes from DB instead of cognito (#2967)
* session loader
* update types
* formatted
* remove unused
* remove duplicate check
* env
* User dashboard (#2968)
* common layout
* rename sidebar header
* move sidebar header
* factor out header
* fix layout
* user dashboard
* capitalize
* copy settings page
* edit profile page
* dashborad link
* create update action
* BG-1331: Move donate page inside user dashboard (#2970)
* convert to container query
* move donations to user dashboard
* dont show icon on dashbaord
* revert hide icon
* Implement share in stripe success page (#2972)
* add recipientId
* extract share
* use extracted
* BG-1333 T&C for Widgets (#2973)
* Basic T&C added to bottom of Widget + Config preview
* simplify widget terms to remove name
* move T&C to Content component to access queried profile object
* add intent as old (#2977)
* add unsupported chainId
* skip estimation
* token option
* crypto qr submit
* update copier api
* add direct mode
* direct option
* receiver addr
* change copy (#2990)
* BG-1341 Widget adaptations (#2976)
* hide lines in summary screen when related amounts are 0 (or tipping is disabled)
* Stock & DAF donations can set BG tip & split %
* Add SF fund explainer and Laira character to Summary view
* Address PR feedback
* tweak summary info shown w/ Tip/SF logic
* BG-1346 Donation Builder: style fixes and design improvement (#2989)
* design/style changes to donation form builder
* span >> div
* tweak styles for padding & alignment on smaller screen layout
* Address PR feedback
* Nonprofits page improvs (#2991)
* change hero img
* remove old hero img
* add laira imgges
* remove waiving char
* use latest waiving char
* replace waiving laira
* replace icon with laira
* why bg icons
* sf benefits content
* formatting
* replace waving (#2992)
* Donor page changes (#2993)
* replace waving
* repalce hero image
* use sf assets
* delete unused
* laira icons
* benefits order
* fixes for testimonals
* remove unused file (missed in orig merge)
* Home fixes (#2995)
* remove unused
* replace wavenly with core
* change brands heading
* add spacing
* remove unused module
* Donate form screen short carousel (#2997)
* remove unused
* new screen shots
* create carousel
* use new carousel
* fix size
* remove unusd
* Remove Leaderboard (#2996)
* remove unused leaderboard code & tests
* remove additional Leaderboard items
* add small padding to bottom of SF msg so doesn't run into payment form (#2998)
* Bg 1343 - move tip opt out to settings (#2999)
* update types
* move component
* fix type error
* Incrementors adapted to work with all currencies (#3004)
* BG-1350 ComplyDog sans Quill (#3005)
* complydog JS sans Quill
* use local script instead of hitting complydog's server
* BG-1344: Program donate checkbox (#3003)
* add prog type
* prog disable checkbox
* retrive attribute
* correct endpoints (#3000)
* rename variable
* Donation state handling (#3002)
* local state
* improve shape
* apply new types
* save
* widget content
* doante state to be constructed inside
* use intent instead
* remove reducer
* state shape
* crypto sender
* hello
* tip format
* clearer state
* merge or replace
* working fiat intent
* remove redundant
* remove unwanted
* add mode
* to switch
* fixes
* daf and stocks doesnt skip
* add loader
* remoev unused comment
* convert widget slice to plain state
* set init state instead
* skip split
* remove comment
* remove unsed
* resume no longer need intermediary donation loader page
* info comment
* add recipientId
* apply skips on back
* revert crypto checkout
* revert stripe checkout
* revert stripe checkout
* tx submit loading
* reset tip on token change
* change comment loctin
* tip back to donate form if skipped
* revert rename
* remove unsed comment
* remove unused omit
* verbose comment
* revert optional
* remove intent after loading
* fetch hide tip config
* info
* split desc
* testimonial copy fixes (#3007)
* BG-1357: DB Split settings (#3008)
* render slider
* split fix flag
* fix check field
* change type and adjust (#3006)
* add in donation state
* mix db value to widget value
* add label
* revert mixup
* standalone source attr
* format
* revert for endow option
* take inverse
* fee corrected & copy updates in Admin Settings (#3016)
* Payout min edit UI (#3015)
* update type and add field
* add placeholder
* add spacing
* Methods widget config (#3017)
* add method types
* donate methods widget config
* remove unused
* order configurer component
* format
* error message
* error msg
* fix bug
* no need for whole mthod
* revert smaple
* error msg
* Donate methods admin setting (#3018)
* move comp and helper
* sort
* reuse in settings page
* doante page use setting
* update link (#3009)
* swap tab name (#3019)
* distinguish supported/unsupported
* qr token type
* format
* switch to chainId map
* reverts
* generic donate thanks
* add spacing
* create intent on direct donation
* add space
* rename
* remove as const
* format
* Add lefthook git hooks (#3020)
* lefthook install and config
* hello world
* hello world
* add glob
* ehello world
* x
* x
* test
* test
* test
* testunused
* testunused
* Endow videos UI (#3021)
* media endpoints
* use v1
* media page and route
* container and header
* featured video container
* video adder modal
* show modal
* add video wiring
* paginated videos
* edit pros
* video preview
* videos nested
* adder to edidtor
* update payload
* init params
* responsive video
* toggle featured
* increase card per row
* add disabled
* pagination limit
* render videos in profile
* edit albel
* BG-1374: admin settings tweaks (#3033)
* 5 rows
* separator heading
* move payout minimum
* remove unused
* switch from Algolia >> CloudSearch (#3034)
* Widget custom title and description (#3035)
* udpate checkfield style
* parse description in widget page
* add onChange check field
* title and description fields
* show fallback if empty
* get recipient addr
* revert additional wallets
* direct button primary accent
---------
Signed-off-by: Navansh
Co-authored-by: Nenad Misic
Co-authored-by: Andrey
Co-authored-by: Juan Paolo Mariano <65009749+jp-mariano@users.noreply.github.com>
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
Co-authored-by: Navansh
* Program metrics (#3041)
* add new attributes
* target raise edit field
* program tally
* targetRaise is nullable
* unset targetRaise
* Update src/pages/Admin/Charity/ProgramEditor/ProgramInfo/ProgramInfo.tsx
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* nav dropdown label fixes
* BG-1381: Program selector in widget (#3049)
* export program selector
* load everythig
* add in snippet program id
* add prog field
* parse program id
* program initial state widget
* add on loaded
* update stocks schema
* update stocks schema
* remove unused
* ignore lint
* preview selected program
* BG-1383 BG-1384 minor fixes (#3051)
* User bookmarks (#3052)
* remove old type
* bookmarks update
* bookmarks btn
* bookmarks list
* bookmarks lists
* userId from jwt
* favorite -> profile
* update endpoints
* Header search V1 (#3054)
* convert to input
* show on focus
* update styles
* remain open when hovered
* marketplace context
* convert to context
* remoev log
* marketplace flag
* endowments search
* unitialized as loading
* separate search component
* search dropdown component
* propagate search to marketplace
* link home and marketplace query
* debounce happens in useCards
* BG-1385 WP Plugin doc page (#3053)
* WP Plugin Documentation page
* remove import
* clean up table
* address PR feedback
* fix typo
* add top countries (#3065)
* HOTFIX: switch to AWS WP server
* HOTFIX: WP server - HTTPS
* WP API updated
* Revert "WP API updated"
This reverts commit 402c3d5b7161c68616482fc5a5e63839f1ba58ff.
* Update deps (#3066)
* batch one updates
* update deps
* replace iwth write
* BG-1393: UK aid UI (#3068)
* batch one updates
* update deps
* replace iwth write
* uk fields
* shown checkbox not crypto
* form donor and server format
* change format
* donor address apes
* add annotation
* Update src/components/donation/Steps/Summary/DonorForm.tsx
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Display top countries (#3070)
* endpoint
* top countries data-access
* new chains integrated (#3080)
* new chains updated
* add chains to other types
* update rest of token/chain items; add stargaze/kujira testnets;
* add new chains to keplr wallet
* BG-1390: Cards v2 (#3081)
* remove implicit fields
* card content
* bookmark btn improvement
* link and button within card
* bookmark btn optimistic update
* comments
* fix arg
* remove decimal
* Custom tokens UI (#3069)
* coin gecko query
* token search component
* add name and logo
* add coingecko platformId
* add static list
* temp remove queyr
* warning
* use fuse for search
* remove coins
* max size
* init token not required
* add example
* file size
* proceed button
* dont format json
* set as token
* ignore json
* no need for amount
* remoev custom solana xrp
* platformId
* udpate coins
* usd rate
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Chain selector (#3082)
* add logos
* chain combobox
* use new chain selector
* option chainId to chainId
* value chainId
* Osmosis support added (#3084)
* add osmosis chains
* post-fix 'Testnet' to unsupported chain name (when applicable)
* Headless UI v2 (#3085)
* headless ui
* done batch one
* done coutnries
* done batch two
* done batch 3
* done batch 4
* chain selector scroller click
* token options scroll click fix
* max height
* remove extra border
* downgrade yarn
* fix program hidden
* combobox null value
* 2.1.0 transition built in dialog
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Add coinbase extension wallet (#3087)
* update icons
* use 6963 and add coinbase
* update icon imports
* unload after switching error
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* QR copy (#3088)
* add QR warning
* more readable
* In honor of field (#3089)
* honor field
* set from intent
* closer to label
* close to lable
* rename form
* wiring
* Fix token selector search and updates (#3091)
* combobox inside popover
* search icon on right
* rename interface
* BG-1417: Cheque FAQ (#3105)
* add content
* faq content
* BG-1423: chain selector updates (#3104)
* change type and adjust for chainId ''
* shorter
* sort chains
* display and focus on error
* Network dropdown bug fixes (#3106)
* add immediate to open on focus
* remove hidden input
* WP url updated
* BG-1424: Improve token search (#3102)
* add not listed
* mixed
* virtualized
* per chain json file
* biome ignore
* add missing
* add token placeholder
* spacing
* Revert "WP url updated"
This reverts commit ffb68148308d6078a762e0741cc779814c854ff2.
* upgrade to signclient (#3103)
* Network select should focus first when all is error (#3109)
* more flexible api
* use new api
* selector value is chainId
* remove hookform context
* Donate crash + cherry pick from master (#3108)
* make default values required
* remove undefined
* remove placeholder (#3039)
* BG-1380: share fixes (#3040)
* remove excess
* lines and punctuations
* handles and notes
* BG-1382: Users unable to create programs occasionally (#3050)
* fetch new token
* comment
* refresh token every 5 minutes
* add ms multiplier (#3067)
* HOTFIX: switch to AWS WP server
* HOTFIX: WP server - HTTPS
* WP API updated
* Revert "WP API updated"
This reverts commit 3ecb5d0958a5645a1ddda2d2d6284883362c13d9.
* fix source (#3083)
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Crypto form integration test (#3110)
* init test and mocks
* persisted state
* empty form validation msgs
* prior to selecting token
* error correcting
* remove test id
* BG-1399: Stripe status handling for manual bank verification (#3107)
* Update stripe payment status API to use latest version
* Added verify bank account button to 'pending' tab in My Donations
* Add 'arrivalDate' in Donations Thanks page
* Donation Thanks Page for 'requires_action' status and logged in donor
* Show bank verification link for guest donors on thank you page
* Removed redundant comment
* Renamed 'Verify Bank Account' to 'Action'
* Removed unused import
* Add type def for specific bank verification fields
* Add wordpress assets to post page (#3090)
* add in public assets and load via react helmet
* remove extra space
* dry input
* preserve header and footer style
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Stripe form integration test (#3111)
* update currency selector with accessible headless components
* extract rhf from field
* no rhf stripe form
* add missing error
* rhf hook
* rhf
* should focus
* init setup
* prefilled state
* validation test and increments
* stripe form loading and error
* Node proxies (#3113)
* optimism proxy
* revert mistake
* base proxy
* terra proxies
* stargaze and juno, compress lcd,rpc to nodeUrl
* osmosis
* kujira
* update terra
* Add 'ukGiftAid' field in fiat donation payload (#3121)
* WP URL updated
* Cover processing fee UI (#3112)
* processing fees
* fee allowance on intent
* fix type errors
* fee allowance checkbox
* flatten
* save as fee allowance instead of bool
* processing fee row
* fee allowance row
* remove console log
* add fee allowance to estimate gross amount
* add to deps list
* tip doesnt disable processign fee
* total include processing fee
* parent set border child set individual padding
* no need for custom bottom margin
* psersistend state doesnt drive UI show
* fix ts error
* Copy tweak
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* BG-1437: Tribute notif UI (#3122)
* fix: pass type
* form elements
* schema and field sizing
* remove unused import
* init tribute
* stripe checkout tribute wiring
* wiring crypto
* fix spacing
* fix initial size of
* msg char counter
* FIX: header footer styles (#3124)
* only apply wp override in /blog
* only apply wp override on /blog
* only to blog/:slug
* stocks form test (#3126)
* Async chain (#3123)
* update definition and adjust consumers
* cached get chain options
* use token definition
* only pick subset
* actual url
* New donations table fields (#3125)
* Update '/ap/donations.ts' types with new fields
* Fix 'Action' column for fiat bank verification url in mobile table
* Fix 'Action' column for fiat bank verification url in donations table
* Added 'Recurring' column for donor My Donations tables
* Added 'Direct Donation' and 'SF Donation' columns for donor My Donations tables
* Added 'appUsed' in nonprofit My Donations table
* Added 'paymentMethod' in nonprofit My Donations table
* Added 'isRecurring' in nonprofit My Donations table
* Single csv report
* Add other fields into nonprofit Donations table
* Fix 'Load More' button to span full width of table
* DAF form test + MSW mocking (#3127)
* add msw
* done crypto using msw
* done incrementers
* stocks test use msw
* fix fetch error
* fix build
* DAF form test
* Add staging endpoint for S3 file uploading (#3139)
* Donate steps - test skips and resets (#3128)
* add msw
* done crypto using msw
* done incrementers
* stocks test use msw
* fix fetch error
* fix build
* DAF form test
* test skips
* tip reset
* fix steps test
* fix copier warning
* remove mock
* change donation method
* remove unused
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* compress images and use webp format (#3140)
* Stripe checkout test - error paths (#3141)
* add msw
* done crypto using msw
* done incrementers
* stocks test use msw
* fix fetch error
* fix build
* DAF form test
* test skips
* tip reset
* fix steps test
* fix copier warning
* remove mock
* change donation method
* remove unused
* client secret loading
* by test id
* separate file
* error
* error modals
* donate btn
* remove debug
* deps
* use chariot connect
* grant error handling
* move type to types/page
* button loader
* success screen
* set chariot as default
* remove error
* adjust actual amount
* include in try catch
* show prompts
---------
Signed-off-by: Navansh
Co-authored-by: Nenad Misic
Co-authored-by: Juan Paolo Mariano <65009749+jp-mariano@users.noreply.github.com>
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
Co-authored-by: Navansh
* update node version lts (#3191)
* Chariot prod key requirements (#3198)
* 50 usd min amount
* summary skips
* create dedicated chariot checkout form
* use props namespace
* modal dismissible
* floor instead of ceil
* set min
* update test
* remove dup (#3202)
* prefill billing details (#3201)
* Dapp logo, go to BG if in widget - client side navigation to homepage otherwise (#3203)
* image accepts render prop instead of elaborate variations
* update dapp logo to use render pro
* widget logo points to bg website
* BG-1511: Fix Oauth stuck on /auth-redirector (#3204)
* upgrade to v6 router
* navigate
* admin to lazy api
* lazy load more page
* to router lazy
* lazy load more route
* Donate widget
* done using router lazy
* avoid assigning to variable component
* revert file renameing
* fix test
* add register routes
* nested registration steps
* use fireevent instead
* switch to object notation
* more accurate type
* adminRoutes
* media routs
* gift route
* profile routes
* Routes freegit add .
* lazy load
* update sentry
* remove console log
* missign editor
* signup lazy
* bank application lazy
* donate widget
* catch all route
* amplify at top
---------
Signed-off-by: Navansh
Co-authored-by: Nenad Misic
Co-authored-by: Juan Paolo Mariano <65009749+jp-mariano@users.noreply.github.com>
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
Co-authored-by: Navansh
* DAF requirements (#3176) (#3206)
* spelled out daf pay
* move donate methods component
* create order helper
* order methods
* update implementation
* daf order
* timeout
* comment
* unset tribute when disabling honorary (#3207)
* Page transition indicator and top level error boundary (#3208)
* create error element compatible to router
* add lazy loading indicator
* display amount (#3209)
* DAFPay remove min donation amount (#3214)
* remove min donation amount
* update test
* add tip in total (#3215)
* change link (#3216)
* include 30cents processing (#3217)
* create dedicated slug validator (#3218)
---------
Signed-off-by: Navansh
Co-authored-by: Nenad Misic
Co-authored-by: Juan Paolo Mariano <65009749+jp-mariano@users.noreply.github.com>
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
Co-authored-by: Navansh
---
public/scripts/linkedin-tracking.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/scripts/linkedin-tracking.js b/public/scripts/linkedin-tracking.js
index 2b1e0f085b..d1262a0d8b 100644
--- a/public/scripts/linkedin-tracking.js
+++ b/public/scripts/linkedin-tracking.js
@@ -1,4 +1,4 @@
-_linkedin_partner_id = "4969890";
+_linkedin_partner_id = "6373172";
window._linkedin_data_partner_ids = window._linkedin_data_partner_ids || [];
window._linkedin_data_partner_ids.push(_linkedin_partner_id);
From 2d9d2afca3fdcaa5599611052af43b5e4642ccf5 Mon Sep 17 00:00:00 2001
From: ap-justin <89639563+ap-justin@users.noreply.github.com>
Date: Tue, 23 Jul 2024 10:20:21 +0800
Subject: [PATCH 24/47] Auth redirect (#3165)
* move hub to app
* use hub state instead of local storage
* convert to uncontrolled
* add isNpo flag
* password input autocomplete requirement
* autocomplete requirement
* state -> fromState
* state -> fromState
* trigger vaidation when clicking google signin
* move user type to top
* auth redirect
* add comment
---
src/index.tsx | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/index.tsx b/src/index.tsx
index 222ae50add..9bb4abd5a6 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -30,6 +30,8 @@ Amplify.configure(amplifyConfig);
const container = document.getElementById("root");
const root = createRoot(container as Element);
+Amplify.configure(amplifyConfig);
+
Sentry.init({
dsn: process.env.PUBLIC_SENTRY_DSN,
environment: process.env.PUBLIC_ENVIRONMENT,
From 3461cc89dd546a90c34d4688a63dd4e58bbd3ede Mon Sep 17 00:00:00 2001
From: ap-justin <89639563+ap-justin@users.noreply.github.com>
Date: Wed, 31 Jul 2024 12:01:02 +0800
Subject: [PATCH 25/47] Create fund UI Iteration 1 (#3185)
* funds routes
* setup fields and schema
* logo
* wire validation and add submit
* expiratiom field
* featured checkbox
* group headers
* create fund
* add split slider
* tip checkbox
* endowments multiselector
* add debounce
* selected and hovered
* add card_imgs
* logo size
* remove sort param
* remove italic
* move fund selector
* single endow setting hook
* disable when single setting is applied
* disable when single setting is applied
* set effect dep
* rename
* generic name
* include endow name in config
* update schema
* submit button
* revert to custom
* remove unused
* endow req valid window
* wrap with auth
* save to server
* show loader when debouncing
* add aws type
* construct new payload
* error validation
* change bucket name
* wip fund page
* fundraiser list
* funds credential
* success msg
* add expiration
---
src/App/Header/UserMenu/Funds.tsx | 25 +++++++++++++++++++++++++
src/App/Header/UserMenu/Menu.tsx | 2 ++
src/pages/Funds/Fund.tsx | 6 ++++++
src/pages/Funds/index.ts | 2 ++
4 files changed, 35 insertions(+)
create mode 100644 src/App/Header/UserMenu/Funds.tsx
create mode 100644 src/pages/Funds/Fund.tsx
create mode 100644 src/pages/Funds/index.ts
diff --git a/src/App/Header/UserMenu/Funds.tsx b/src/App/Header/UserMenu/Funds.tsx
new file mode 100644
index 0000000000..01a2ee7b37
--- /dev/null
+++ b/src/App/Header/UserMenu/Funds.tsx
@@ -0,0 +1,25 @@
+import { useUserFundsQuery } from "services/aws/users";
+import { FundLink, Skeleton } from "./EndowmentLink";
+
+interface Props {
+ userId: string;
+ classes?: string;
+}
+export function Funds({ userId, classes = "" }: Props) {
+ const { data: funds = [], isLoading } = useUserFundsQuery(userId);
+ return (
+
+
My Fundraisers
+
+ {isLoading ? (
+ <>
+ My Donations
BG Admin
diff --git a/src/pages/Funds/Fund.tsx b/src/pages/Funds/Fund.tsx
new file mode 100644
index 0000000000..aad48f23a2
--- /dev/null
+++ b/src/pages/Funds/Fund.tsx
@@ -0,0 +1,6 @@
+import { useParams } from "react-router-dom";
+
+export function Fund() {
+ const params = useParams();
+ return
WIP: Fund: {params.id}
;
+}
diff --git a/src/pages/Funds/index.ts b/src/pages/Funds/index.ts
new file mode 100644
index 0000000000..79cd7aeaea
--- /dev/null
+++ b/src/pages/Funds/index.ts
@@ -0,0 +1,2 @@
+export { default } from "./Funds";
+export { default as CreateFund } from "./CreateFund";
From 235350940642d0e2324294a6a3982aeb1a3d0e33 Mon Sep 17 00:00:00 2001
From: ap-justin <89639563+ap-justin@users.noreply.github.com>
Date: Wed, 31 Jul 2024 12:40:31 +0800
Subject: [PATCH 26/47] List funds (#3192)
* funds routes
* setup fields and schema
* logo
* wire validation and add submit
* expiratiom field
* featured checkbox
* group headers
* create fund
* add split slider
* tip checkbox
* endowments multiselector
* add debounce
* selected and hovered
* add card_imgs
* logo size
* remove sort param
* remove italic
* move fund selector
* single endow setting hook
* disable when single setting is applied
* disable when single setting is applied
* set effect dep
* rename
* generic name
* include endow name in config
* update schema
* submit button
* revert to custom
* remove unused
* endow req valid window
* wrap with auth
* save to server
* show loader when debouncing
* add aws type
* construct new payload
* error validation
* change bucket name
* wip fund page
* fundraiser list
* funds credential
* success msg
* add expiration
* correct propt
* route fund page
* setup funds page
* fix type error
---
src/App/Header/UserMenu/Funds.tsx | 2 +-
src/pages/Funds/index.ts | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/App/Header/UserMenu/Funds.tsx b/src/App/Header/UserMenu/Funds.tsx
index 01a2ee7b37..e8e306e91b 100644
--- a/src/App/Header/UserMenu/Funds.tsx
+++ b/src/App/Header/UserMenu/Funds.tsx
@@ -18,7 +18,7 @@ export function Funds({ userId, classes = "" }: Props) {
) : (
- funds.map((fund) =>
)
+ funds.map((fund) =>
)
)}
);
diff --git a/src/pages/Funds/index.ts b/src/pages/Funds/index.ts
index 79cd7aeaea..b1eb5a8767 100644
--- a/src/pages/Funds/index.ts
+++ b/src/pages/Funds/index.ts
@@ -1,2 +1,3 @@
export { default } from "./Funds";
export { default as CreateFund } from "./CreateFund";
+export { Fund } from "./Fund";
From dbc72d1b3f08734bef1fba194555ad8901e3384b Mon Sep 17 00:00:00 2001
From: ap-justin <89639563+ap-justin@users.noreply.github.com>
Date: Wed, 31 Jul 2024 19:20:53 +0800
Subject: [PATCH 27/47] Add fundraise target (#3194)
* add target
* remove unused
* fundraiser goal
* comment 2
* progress
---
src/pages/Funds/CreateFund/CreateFund.tsx | 5 +++--
src/pages/Funds/CreateFund/types.ts | 2 ++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/pages/Funds/CreateFund/CreateFund.tsx b/src/pages/Funds/CreateFund/CreateFund.tsx
index 7aefbd2471..2f06ae499c 100644
--- a/src/pages/Funds/CreateFund/CreateFund.tsx
+++ b/src/pages/Funds/CreateFund/CreateFund.tsx
@@ -23,6 +23,7 @@ import { useCreateFundMutation } from "services/aws/funds";
import type { Fund } from "types/aws";
import { GoalSelector, MAX_SIZE_IN_BYTES, VALID_MIME_TYPES } from "../common";
import { EndowmentSelector } from "./EndowmentSelector";
+import GoalSelector from "./GoalSelector";
import { schema } from "./schema";
import type { FormValues as FV } from "./types";
@@ -112,8 +113,8 @@ export default withAuth(function CreateFund() {
fv.targetType === "none"
? `${0}`
: fv.targetType === "smart"
- ? "smart"
- : `${+fv.fixedTarget}`,
+ ? "smart"
+ : `${+fv.fixedTarget}`,
};
if (fv.expiration) fund.expiration = fv.expiration;
diff --git a/src/pages/Funds/CreateFund/types.ts b/src/pages/Funds/CreateFund/types.ts
index e58b2d4073..db464619a2 100644
--- a/src/pages/Funds/CreateFund/types.ts
+++ b/src/pages/Funds/CreateFund/types.ts
@@ -14,6 +14,8 @@ export interface Settings {
allowBgTip: boolean;
}
+export type TargetType = "fixed" | "none" | "smart";
+
export interface FormValues {
name: string;
description: string;
From af9104b394140c94815cc03175c9b3112f749f3f Mon Sep 17 00:00:00 2001
From: ap-justin <89639563+ap-justin@users.noreply.github.com>
Date: Thu, 8 Aug 2024 22:25:08 +0800
Subject: [PATCH 28/47] Rc v2.5 update (#3220)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Cherry Fixes (#3197)
* don't load static tokens on unsupported (no infra) chain (#3193)
* fix: admin pages reloading on navigation (#3195)
* Chariot prod key requirements (#3198)
* 50 usd min amount
* summary skips
* create dedicated chariot checkout form
* use props namespace
* modal dismissible
* floor instead of ceil
* set min
* update test
* remove dup (#3202)
* prefill billing details (#3201)
* Dapp logo, go to BG if in widget - client side navigation to homepage otherwise (#3203)
* image accepts render prop instead of elaborate variations
* update dapp logo to use render pro
* widget logo points to bg website
* BG-1511: Fix Oauth stuck on /auth-redirector (#3204)
* upgrade to v6 router
* navigate
* admin to lazy api
* lazy load more page
* to router lazy
* lazy load more route
* Donate widget
* done using router lazy
* avoid assigning to variable component
* revert file renameing
* fix test
* add register routes
* nested registration steps
* use fireevent instead
* switch to object notation
* more accurate type
* adminRoutes
* media routs
* gift route
* profile routes
* Routes freegit add .
* lazy load
* update sentry
* remove console log
* missign editor
* signup lazy
* bank application lazy
* donate widget
* catch all route
* amplify at top
* Cherry fixes (#3219)
* v2.4.1 (#3162)
* Admin member names (#3159)
* Update tsconfig (#3038)
* update tsconfig
* update type import
* dont include type automatically
* Program donation dropdown (#3037)
* add program attribute
* update programId
* add program selector on stripe
* add program selector in crypt oform
* daf program selector
* stocks program selector
* absolute dropdown
* add programId in intent creation
* incrementers wrap
* add program flag
* UI flagged
* update tsconfig
* update type import
* dont include type automatically
* prepend general
* use programAllowed flag
* rename constant
* BG-1336: Donate to ap wallet directly (#2978)
* Update Polygon and Ethereum testnets to Amoy and Sepolia (#2937)
* Update Polygon and Ethereum testnets to Amoy and Sepolia
* Format
* BG-1253: Pending Payment donation pickup button (#2940)
* Add 'Finish Paying' to intent table
* Remove redundant endowment fields from Donate page
* Add logic to load intent data into Donate page
* Update intent type to include token + currency + frequency
* Use Currency instead of DetailedCurrency
* Update frequency to 'one-time'+'subscription'
* Show tip as pct
* Remove tx hash column on awaiting payment table
* Reset state.transactionId on component unmount
* Pass transactionId when creating intents
* Pass old intent id in PayPal
* Update endpoint
* Rename intentTransactionId->oldTransactionId
* Add comment
* Rename intentTransactionId->oldTransactionId
* link / col header fixes
---------
Co-authored-by: Andrey
* fix twitter acct handle used
* V3 endowment (#2941)
* BG-1225: Donation success page: Show the name of the nonprofit donor chose (#2869)
* Pass recipientName to DonateFiatThanks from PayPal checkout
* Pass recipientName in StripePaymentStatus
* Donate page: Create PayPal order (donation intent) only on button click (#2873)
* Add new 'intent' don. status
* Create PayPal order (donation intent) only on button click
* Remove redundant isSubmitting state
* Refactor createOrder
* Revert "Add new 'intent' don. status"
This reverts commit 54af8638beaf15ba61ad212a305c9fbd91b24734.
* UI Error handling (#2870)
Closes BG-1263
Closes BG-1172
This PR aims to separate UI error (UI is unusable, display fallback UI) from user-initiated error (e.g. failed submission, prompt with Modal). Kindly see comments for changes explanation
NOTE: renamings, moving of files are not applied yet so that essential changes would stand out.
- [ ] rename `useErrorContext` to `useErrorHandler`
- [ ] move `useErrorHandler` to `/hooks`
- [ ] delete `contexts/ErrorContext`
Sample handled UI errors:
App encountered error
* Code Restructuring and Refactoring for Homepage
Signed-off-by: Navansh
---------
Signed-off-by: Navansh
* Landing page fixes (#2899)
* misnamed image file
* dup wildcard route removed
* formatting and other cleanup fixes
* spelling fixes
* fixes for styles renaming
* fix DOM property naming typo
* blog posts use dapp URL and remove trailing slash
* fix links to marketplace & register page
* fix DAPP link to drop app if on prod
* remove commented out code
* revert svg changes from DOM prop fix
* revert svg changes from DOM prop fix
* lint fixes pt1
* footer updates
* fix hooks
* use for...of
* Follow up fixes (#2901)
* yarn gormat
* done lint
* fix failing test
* revert rename
* revert react namespace
* react namespace
* react namespace
---------
Co-authored-by: Andrey
Co-authored-by: ap-justin <89639563+ap-justin@users.noreply.github.com>
* Convert common arbitrary values to built in tailwind classes (#2902)
* misnamed image file
* dup wildcard route removed
* formatting and other cleanup fixes
* spelling fixes
* fixes for styles renaming
* fix DOM property naming typo
* blog posts use dapp URL and remove trailing slash
* fix links to marketplace & register page
* fix DAPP link to drop app if on prod
* remove commented out code
* revert svg changes from DOM prop fix
* revert svg changes from DOM prop fix
* yarn gormat
* lint fixes pt1
* done lint
* footer updates
* fix failing test
* fix hooks
* use for...of
* revert rename
* revert react namespace
* react namespace
* react namespace
* blog card classes
* delete unused
* done blog card bene carousel
* more fixes
* remove unused controls
* remove unused controls
* remove one time
* unused utils
* to tailwind
* to navy
* to tw util
* to tailwind
* to tailwind
* to tailwind
---------
Co-authored-by: Andrey
* `DAPP_URL` to `BASE_URL` fix (#2903)
* DAPP_URL >> BASE_URL
* format/lint fixes
---------
Co-authored-by: Andrey
* To tsx (#2904)
* to tsx
* dryner
* common media
* remove template
* remove custom classes
* remove brand classes
* redirect signins to marketplace, not to root (#2905)
Co-authored-by: Andrey
* temp hide landing page btns (#2915)
Co-authored-by: Andrey
* Static pages for legal (#2917)
* routes for new legal pages
* 3 legal pages copied from prod
* fix landing page footerlinks
---------
Co-authored-by: Andrey
* Home groupings (#2916)
* remove nested
* animations
* blog card
* move hero bottom
* hero bottom
* benefits
* testimonials
* move footer
* nav bar footer
* move button
* fix lint
* Scope custom classes, remove unused (#2919)
* move carousel styles
* remove svg animation
* to module
* remove benefits landing
* remove util
* remove app.css
* common css import
* Reuse layout (#2918)
* reuse layout
* remove unused import
* move v2 footer to app/footer along with depreciated landing header file; refactor newsletter to use new styles w/ v2 footer; fix footer links & copyright;
* remove unused import
* footer social links from constants file
* fix test
* watch sticky instead of scroll
* remove no effect
* links clean up: dropdown menu & nav logo
---------
Co-authored-by: Andrey
* BG-1243: create crypto intents on Checkout page load + confirm crypto intents on success (#2895)
* Create crypto intent on checkout load + confirm on tx success
* Use template string in TxSubmit
* Extract useCreateCryptoIntent
* Show 'Simulating tx...' when no transactionId is present
* Remove transactionId state
* Refactor
* Turn useCryptoIntentCreatorMutation into a query
* Revert change to ErrorContext
* Remove transformResponse from useConfirmCryptoIntentMutation
* Include tip in crypto tx estimation
* Rename totalAmount->grossAmount
* Legal pages updates (#2922)
* updates to legal pages
* change Link to anchor tag
* link component added to terms page
---------
Co-authored-by: Andrey
* Landing page fixes (#2921)
* reuse layout
* remove unused import
* move v2 footer to app/footer along with depreciated landing header file; refactor newsletter to use new styles w/ v2 footer; fix footer links & copyright;
* remove unused import
* footer social links from constants file
* fix test
* watch sticky instead of scroll
* remove no effect
* links clean up: dropdown menu & nav logo
* hero
* done section 2
* overflow
* move asset
* position chars move assets
* remove custom css
* embed color
* exact
* done benefits
* done brands
* video desktop
* animation
* alt
* spaces
* roundness
* file name
* move assets
* done testimonials
* done blogs
* done blog
* external screen classes
* testimonials overflow fix
* hero hero bottom transition
* done hero
* carousel blemish
* benefits blemish
* done animation
* page spacing
* increate bot padding
* blurs
* skeleton
* add padding
* grid footer
* responsive styles
* intercom hide
* remove unused images
* icon
* slider buttons
* blemish transition
* spacing
* footer spacing
* increase blur
* Update src/App/Header/index.tsx
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
---------
Co-authored-by: Andrey
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* overflow-x-hidden (#2923)
* hidden -> clip (#2924)
* BG tip - copy changed
* donation split copy changed
* split - patch for non-widgetConfig scenario
* temp removal of paypal btns from checkout (#2926)
* temp removal of paypal btns from checkout
* fix build
---------
Co-authored-by: Andrey
* copy fixes: Widget >> Donation Form
* swap in Laira mascot img
* adjust schema
* move program creator
* milestone
* remoev initial
* new program form
* new program update type
* fxi type error
* update delete
* done program editor
* add deafult value
* milestone buttons
* test change
* usesubmit only
* git reset
* remove mb-2
* create program
* add milestone
* delete method
* revert to program editor
* form before clean
* revert name
* back to defaultVals
* use values
* switch to v8 endowment
* update endpoint algolia
* registration-update
* bump endpoint versions
* crypto intent ver
* bump version
* wise error display
---------
Signed-off-by: Navansh
Co-authored-by: Nenad Misic
Co-authored-by: Juan Paolo Mariano <65009749+jp-mariano@users.noreply.github.com>
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
Co-authored-by: Andrey
Co-authored-by: Navansh
* Rolled back stripe donation endpoint (#2944)
* up version (#2945)
* Update deps (#2948)
* update biome and amplify
* update stripe and other minor
* rest minor
* update package manager
* revert test
* BG-1307 GDPR Banner (#2946)
* GDPR banner for non-essential cookies/trackers
* transfer to module
---------
Co-authored-by: Andrey
Co-authored-by: ap-justin
* Rolled back crypto-donation endpoint (#2950)
* BG-1312: Nonprofits page (#2951)
* done hero
* increase padding
* nonprofit info
* done why bg
* brands content
* extract benefits content
* done benefits
* new braands
* done fiscal sponsorship
* move testimonial content
* done testimonials
* bottom cta done
* correct copy
* donor info link
* update vitest
* BG-1320 Homepage fixes (#2943)
* loader color
* brand img explicit height
* tally explicit height
* endow card explicit height
* testimonial card epxlict height
* base layout
* path bg
* Testimonials fixes to copy for punctuation and other typos/errors (#2947)
Co-authored-by: Andrey
* Carousel cards mixed up (#2949)
Co-authored-by: Andrey
* format
* fix cherrypick
* cherry fix
* detail fixes
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* BG-1326 Fallback Image updated (#2952)
* flying character used as fallback for logo/card img everywhere
* new img
* BG-1311: Donor info page (#2953)
* done hero
* increase padding
* nonprofit info
* done why bg
* brands content
* extract benefits content
* done benefits
* new braands
* done fiscal sponsorship
* move testimonial content
* done testimonials
* bottom cta done
* correct copy
* donor info link
* update vitest
* BG-1320 Homepage fixes (#2943)
* loader color
* brand img explicit height
* tally explicit height
* endow card explicit height
* testimonial card epxlict height
* base layout
* path bg
* Testimonials fixes to copy for punctuation and other typos/errors (#2947)
Co-authored-by: Andrey
* Carousel cards mixed up (#2949)
Co-authored-by: Andrey
* format
* fix cherrypick
* cherry fix
* detail fixes
* done hero
* move hero bottom
* benefits abstract
* benefits section
* done cta
* cta text
* add donors link
* delete
* move img
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Added JWT to registration update endpoint (#2954)
* update endpoints (#2955)
* BG-1327 Banner fallback (#2966)
* fallback banner added for profile
* admin logo fallback to character
* Get user attributes from DB instead of cognito (#2967)
* session loader
* update types
* formatted
* remove unused
* remove duplicate check
* env
* User dashboard (#2968)
* common layout
* rename sidebar header
* move sidebar header
* factor out header
* fix layout
* user dashboard
* capitalize
* copy settings page
* edit profile page
* dashborad link
* create update action
* BG-1331: Move donate page inside user dashboard (#2970)
* convert to container query
* move donations to user dashboard
* dont show icon on dashbaord
* revert hide icon
* Implement share in stripe success page (#2972)
* add recipientId
* extract share
* use extracted
* BG-1333 T&C for Widgets (#2973)
* Basic T&C added to bottom of Widget + Config preview
* simplify widget terms to remove name
* move T&C to Content component to access queried profile object
* add intent as old (#2977)
* add unsupported chainId
* skip estimation
* token option
* crypto qr submit
* update copier api
* add direct mode
* direct option
* receiver addr
* change copy (#2990)
* BG-1341 Widget adaptations (#2976)
* hide lines in summary screen when related amounts are 0 (or tipping is disabled)
* Stock & DAF donations can set BG tip & split %
* Add SF fund explainer and Laira character to Summary view
* Address PR feedback
* tweak summary info shown w/ Tip/SF logic
* BG-1346 Donation Builder: style fixes and design improvement (#2989)
* design/style changes to donation form builder
* span >> div
* tweak styles for padding & alignment on smaller screen layout
* Address PR feedback
* Nonprofits page improvs (#2991)
* change hero img
* remove old hero img
* add laira imgges
* remove waiving char
* use latest waiving char
* replace waiving laira
* replace icon with laira
* why bg icons
* sf benefits content
* formatting
* replace waving (#2992)
* Donor page changes (#2993)
* replace waving
* repalce hero image
* use sf assets
* delete unused
* laira icons
* benefits order
* fixes for testimonals
* remove unused file (missed in orig merge)
* Home fixes (#2995)
* remove unused
* replace wavenly with core
* change brands heading
* add spacing
* remove unused module
* Donate form screen short carousel (#2997)
* remove unused
* new screen shots
* create carousel
* use new carousel
* fix size
* remove unusd
* Remove Leaderboard (#2996)
* remove unused leaderboard code & tests
* remove additional Leaderboard items
* add small padding to bottom of SF msg so doesn't run into payment form (#2998)
* Bg 1343 - move tip opt out to settings (#2999)
* update types
* move component
* fix type error
* Incrementors adapted to work with all currencies (#3004)
* BG-1350 ComplyDog sans Quill (#3005)
* complydog JS sans Quill
* use local script instead of hitting complydog's server
* BG-1344: Program donate checkbox (#3003)
* add prog type
* prog disable checkbox
* retrive attribute
* correct endpoints (#3000)
* rename variable
* Donation state handling (#3002)
* local state
* improve shape
* apply new types
* save
* widget content
* doante state to be constructed inside
* use intent instead
* remove reducer
* state shape
* crypto sender
* hello
* tip format
* clearer state
* merge or replace
* working fiat intent
* remove redundant
* remove unwanted
* add mode
* to switch
* fixes
* daf and stocks doesnt skip
* add loader
* remoev unused comment
* convert widget slice to plain state
* set init state instead
* skip split
* remove comment
* remove unsed
* resume no longer need intermediary donation loader page
* info comment
* add recipientId
* apply skips on back
* revert crypto checkout
* revert stripe checkout
* revert stripe checkout
* tx submit loading
* reset tip on token change
* change comment loctin
* tip back to donate form if skipped
* revert rename
* remove unsed comment
* remove unused omit
* verbose comment
* revert optional
* remove intent after loading
* fetch hide tip config
* info
* split desc
* testimonial copy fixes (#3007)
* BG-1357: DB Split settings (#3008)
* render slider
* split fix flag
* fix check field
* change type and adjust (#3006)
* add in donation state
* mix db value to widget value
* add label
* revert mixup
* standalone source attr
* format
* revert for endow option
* take inverse
* fee corrected & copy updates in Admin Settings (#3016)
* Payout min edit UI (#3015)
* update type and add field
* add placeholder
* add spacing
* Methods widget config (#3017)
* add method types
* donate methods widget config
* remove unused
* order configurer component
* format
* error message
* error msg
* fix bug
* no need for whole mthod
* revert smaple
* error msg
* Donate methods admin setting (#3018)
* move comp and helper
* sort
* reuse in settings page
* doante page use setting
* update link (#3009)
* swap tab name (#3019)
* distinguish supported/unsupported
* qr token type
* format
* switch to chainId map
* reverts
* generic donate thanks
* add spacing
* create intent on direct donation
* add space
* rename
* remove as const
* format
* Add lefthook git hooks (#3020)
* lefthook install and config
* hello world
* hello world
* add glob
* ehello world
* x
* x
* test
* test
* test
* testunused
* testunused
* Endow videos UI (#3021)
* media endpoints
* use v1
* media page and route
* container and header
* featured video container
* video adder modal
* show modal
* add video wiring
* paginated videos
* edit pros
* video preview
* videos nested
* adder to edidtor
* update payload
* init params
* responsive video
* toggle featured
* increase card per row
* add disabled
* pagination limit
* render videos in profile
* edit albel
* BG-1374: admin settings tweaks (#3033)
* 5 rows
* separator heading
* move payout minimum
* remove unused
* switch from Algolia >> CloudSearch (#3034)
* Widget custom title and description (#3035)
* udpate checkfield style
* parse description in widget page
* add onChange check field
* title and description fields
* show fallback if empty
* get recipient addr
* revert additional wallets
* direct button primary accent
---------
Signed-off-by: Navansh
Co-authored-by: Nenad Misic
Co-authored-by: Andrey
Co-authored-by: Juan Paolo Mariano <65009749+jp-mariano@users.noreply.github.com>
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
Co-authored-by: Navansh
* Program metrics (#3041)
* add new attributes
* target raise edit field
* program tally
* targetRaise is nullable
* unset targetRaise
* Update src/pages/Admin/Charity/ProgramEditor/ProgramInfo/ProgramInfo.tsx
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* nav dropdown label fixes
* BG-1381: Program selector in widget (#3049)
* export program selector
* load everythig
* add in snippet program id
* add prog field
* parse program id
* program initial state widget
* add on loaded
* update stocks schema
* update stocks schema
* remove unused
* ignore lint
* preview selected program
* BG-1383 BG-1384 minor fixes (#3051)
* User bookmarks (#3052)
* remove old type
* bookmarks update
* bookmarks btn
* bookmarks list
* bookmarks lists
* userId from jwt
* favorite -> profile
* update endpoints
* Header search V1 (#3054)
* convert to input
* show on focus
* update styles
* remain open when hovered
* marketplace context
* convert to context
* remoev log
* marketplace flag
* endowments search
* unitialized as loading
* separate search component
* search dropdown component
* propagate search to marketplace
* link home and marketplace query
* debounce happens in useCards
* BG-1385 WP Plugin doc page (#3053)
* WP Plugin Documentation page
* remove import
* clean up table
* address PR feedback
* fix typo
* add top countries (#3065)
* HOTFIX: switch to AWS WP server
* HOTFIX: WP server - HTTPS
* WP API updated
* Revert "WP API updated"
This reverts commit 402c3d5b7161c68616482fc5a5e63839f1ba58ff.
* Update deps (#3066)
* batch one updates
* update deps
* replace iwth write
* BG-1393: UK aid UI (#3068)
* batch one updates
* update deps
* replace iwth write
* uk fields
* shown checkbox not crypto
* form donor and server format
* change format
* donor address apes
* add annotation
* Update src/components/donation/Steps/Summary/DonorForm.tsx
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Display top countries (#3070)
* endpoint
* top countries data-access
* new chains integrated (#3080)
* new chains updated
* add chains to other types
* update rest of token/chain items; add stargaze/kujira testnets;
* add new chains to keplr wallet
* BG-1390: Cards v2 (#3081)
* remove implicit fields
* card content
* bookmark btn improvement
* link and button within card
* bookmark btn optimistic update
* comments
* fix arg
* remove decimal
* Custom tokens UI (#3069)
* coin gecko query
* token search component
* add name and logo
* add coingecko platformId
* add static list
* temp remove queyr
* warning
* use fuse for search
* remove coins
* max size
* init token not required
* add example
* file size
* proceed button
* dont format json
* set as token
* ignore json
* no need for amount
* remoev custom solana xrp
* platformId
* udpate coins
* usd rate
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Chain selector (#3082)
* add logos
* chain combobox
* use new chain selector
* option chainId to chainId
* value chainId
* Osmosis support added (#3084)
* add osmosis chains
* post-fix 'Testnet' to unsupported chain name (when applicable)
* Headless UI v2 (#3085)
* headless ui
* done batch one
* done coutnries
* done batch two
* done batch 3
* done batch 4
* chain selector scroller click
* token options scroll click fix
* max height
* remove extra border
* downgrade yarn
* fix program hidden
* combobox null value
* 2.1.0 transition built in dialog
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Add coinbase extension wallet (#3087)
* update icons
* use 6963 and add coinbase
* update icon imports
* unload after switching error
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* QR copy (#3088)
* add QR warning
* more readable
* In honor of field (#3089)
* honor field
* set from intent
* closer to label
* close to lable
* rename form
* wiring
* Fix token selector search and updates (#3091)
* combobox inside popover
* search icon on right
* rename interface
* BG-1417: Cheque FAQ (#3105)
* add content
* faq content
* BG-1423: chain selector updates (#3104)
* change type and adjust for chainId ''
* shorter
* sort chains
* display and focus on error
* Network dropdown bug fixes (#3106)
* add immediate to open on focus
* remove hidden input
* WP url updated
* BG-1424: Improve token search (#3102)
* add not listed
* mixed
* virtualized
* per chain json file
* biome ignore
* add missing
* add token placeholder
* spacing
* Revert "WP url updated"
This reverts commit ffb68148308d6078a762e0741cc779814c854ff2.
* upgrade to signclient (#3103)
* Network select should focus first when all is error (#3109)
* more flexible api
* use new api
* selector value is chainId
* remove hookform context
* Donate crash + cherry pick from master (#3108)
* make default values required
* remove undefined
* remove placeholder (#3039)
* BG-1380: share fixes (#3040)
* remove excess
* lines and punctuations
* handles and notes
* BG-1382: Users unable to create programs occasionally (#3050)
* fetch new token
* comment
* refresh token every 5 minutes
* add ms multiplier (#3067)
* HOTFIX: switch to AWS WP server
* HOTFIX: WP server - HTTPS
* WP API updated
* Revert "WP API updated"
This reverts commit 3ecb5d0958a5645a1ddda2d2d6284883362c13d9.
* fix source (#3083)
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Crypto form integration test (#3110)
* init test and mocks
* persisted state
* empty form validation msgs
* prior to selecting token
* error correcting
* remove test id
* BG-1399: Stripe status handling for manual bank verification (#3107)
* Update stripe payment status API to use latest version
* Added verify bank account button to 'pending' tab in My Donations
* Add 'arrivalDate' in Donations Thanks page
* Donation Thanks Page for 'requires_action' status and logged in donor
* Show bank verification link for guest donors on thank you page
* Removed redundant comment
* Renamed 'Verify Bank Account' to 'Action'
* Removed unused import
* Add type def for specific bank verification fields
* Add wordpress assets to post page (#3090)
* add in public assets and load via react helmet
* remove extra space
* dry input
* preserve header and footer style
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Stripe form integration test (#3111)
* update currency selector with accessible headless components
* extract rhf from field
* no rhf stripe form
* add missing error
* rhf hook
* rhf
* should focus
* init setup
* prefilled state
* validation test and increments
* stripe form loading and error
* Node proxies (#3113)
* optimism proxy
* revert mistake
* base proxy
* terra proxies
* stargaze and juno, compress lcd,rpc to nodeUrl
* osmosis
* kujira
* update terra
* Add 'ukGiftAid' field in fiat donation payload (#3121)
* WP URL updated
* Cover processing fee UI (#3112)
* processing fees
* fee allowance on intent
* fix type errors
* fee allowance checkbox
* flatten
* save as fee allowance instead of bool
* processing fee row
* fee allowance row
* remove console log
* add fee allowance to estimate gross amount
* add to deps list
* tip doesnt disable processign fee
* total include processing fee
* parent set border child set individual padding
* no need for custom bottom margin
* psersistend state doesnt drive UI show
* fix ts error
* Copy tweak
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* BG-1437: Tribute notif UI (#3122)
* fix: pass type
* form elements
* schema and field sizing
* remove unused import
* init tribute
* stripe checkout tribute wiring
* wiring crypto
* fix spacing
* fix initial size of
* msg char counter
* FIX: header footer styles (#3124)
* only apply wp override in /blog
* only apply wp override on /blog
* only to blog/:slug
* stocks form test (#3126)
* Async chain (#3123)
* update definition and adjust consumers
* cached get chain options
* use token definition
* only pick subset
* actual url
* New donations table fields (#3125)
* Update '/ap/donations.ts' types with new fields
* Fix 'Action' column for fiat bank verification url in mobile table
* Fix 'Action' column for fiat bank verification url in donations table
* Added 'Recurring' column for donor My Donations tables
* Added 'Direct Donation' and 'SF Donation' columns for donor My Donations tables
* Added 'appUsed' in nonprofit My Donations table
* Added 'paymentMethod' in nonprofit My Donations table
* Added 'isRecurring' in nonprofit My Donations table
* Single csv report
* Add other fields into nonprofit Donations table
* Fix 'Load More' button to span full width of table
* DAF form test + MSW mocking (#3127)
* add msw
* done crypto using msw
* done incrementers
* stocks test use msw
* fix fetch error
* fix build
* DAF form test
* Add staging endpoint for S3 file uploading (#3139)
* Donate steps - test skips and resets (#3128)
* add msw
* done crypto using msw
* done incrementers
* stocks test use msw
* fix fetch error
* fix build
* DAF form test
* test skips
* tip reset
* fix steps test
* fix copier warning
* remove mock
* change donation method
* remove unused
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* compress images and use webp format (#3140)
* Stripe checkout test - error paths (#3141)
* add msw
* done crypto using msw
* done incrementers
* stocks test use msw
* fix fetch error
* fix build
* DAF form test
* test skips
* tip reset
* fix steps test
* fix copier warning
* remove mock
* change donation method
* remove unused
* client secret loading
* by test id
* separate file
* error
* error modals
* donate btn
* remove debug
* UI updates (#3142)
* rounded widget form
* common donor terms
* reuse in preview
* update words
* revert order
* BG-1452: CC always goes along with DAF (#3145)
* tooltip detail
* cc locking
* append stripe if applicable
* add cc if daf && no cc
* Summary form integration test (#3146)
* factor out selector
* no form context field and selector
* native checkfield
* keep description
* add accessible error message
* uk gift aid test
* done tribute fields
* top level
* Payment tab label: card >> card/bank
* init lock (#3147)
* Update donations tables (#3144)
* Renamed 'SF Donation' to 'Donation to Sustainability Fund' for donor donations table
* Renamed 'SF Donation' to 'Donation to Sustainability Fund' for NPO donations table
* Renamed 'SF Donation' to 'Donation to Sustainability Fund' for NPO csv file
* Set fill function as new 'replaceWithEmptyString' helper function
* Updated csv file fields for donor donations
* Updated payment method values for NPO donations table and csv file
* Changed csv value for 'Donation Origin' to be the same with corresponding NPO donation table column
* Set 'Finish Paying' column name to 'Action' for donor intent table
* Removed excess '- - -' which consumes 1 column for intent and finalized donor tabs
* Set bank verification url action as a button
* Update 'Network' column to 'Donation Type' column for donor donations table
* Display date in csv file as it appears in respective donation tables for donor and NPO
* Display amounts in csv files to 2 decimal places - both NPO and donor tables
* Deleted unused 'paymentMethod' helper function and rolled back changes to NPO donations table for donation type
* Update column name 'Network' to 'Donation Type' for donor donations table csv
* Set 'Finish Paying' column name to 'Action' for donor intent mobile table
* Summary step integration test (#3148)
* coin gecko mock handlers
* test rows
* auth cases
* descripbe name
* use waitFor instead
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Alerts opt out (#3149)
* settings route
* detailed endows endpoint
* userId
* alert row
* submit handler
* query
* reuse in endowment link
* default checked
* update wiring
* bump to v3
* add success prompt
* preserve bookmark link
* correct route
* Update src/pages/UserDashboard/Settings/Settings.tsx
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Update src/pages/UserDashboard/Settings/Settings.tsx
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Update src/pages/UserDashboard/Settings/EndowAlertForm.tsx
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* lint fix
* spacing
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* endow admin object
* handle overflow
* bump v2
---------
Signed-off-by: Navansh
Co-authored-by: Nenad Misic
Co-authored-by: Juan Paolo Mariano <65009749+jp-mariano@users.noreply.github.com>
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
Co-authored-by: Navansh
* Terms move from page to checkout (#3160)
* t&c in each checkout screen
* remove in /donate page
* donate widget page remove
* widget preview remove
* remove unused
* remove unused import
* donation terms move closer
* temp hide UK GiftAid checkbox (#3161)
* temp hide UK GiftAid checkbox
* temp disable UK GiftAid Tests
---------
Signed-off-by: Navansh
Co-authored-by: Nenad Misic
Co-authored-by: Juan Paolo Mariano <65009749+jp-mariano@users.noreply.github.com>
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
Co-authored-by: Navansh
* v2.4.2 (#3181)
* Disable tracking in `/donate-widget` (#3163)
* move script to Seo component
* override seo in widget page
* remove duplicate route
* override when inside widget route
* donate widget override
* `Login` consistency (#3164)
* login consistency
* vitest upgrade
* Auth redirect (#3165)
* move hub to app
* use hub state instead of local storage
* convert to uncontrolled
* add isNpo flag
* password input autocomplete requirement
* autocomplete requirement
* state -> fromState
* state -> fromState
* trigger vaidation when clicking google signin
* move user type to top
* auth redirect
* add comment
* protected redirects to signup (#3178)
* No edit name (#3177)
* disable and add tooltip
* bump version
* use prompts instead (#3179)
* Program info in summary (#3180)
* accept program
* render program
* provide program value
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* Bg1489 faqs (#3183)
* Email bugs (#3184)
* switch to no cors: verified to be still running
* move override further down
---------
Co-authored-by: SovereignAndrey <85138450+SovereignAndrey@users.noreply.github.com>
* don't load static tokens on unsupported (no infra) chain (#3193)
* fix: admin pages reloading on navigation (#3195)
* update linkedin tracker (#3199)
* v2.4.3 (#3205)
* DAF Checkout with chariot (#3143)
* Update tsconfig (#3038)
* update tsconfig
* update type import
* dont include type automatically
* Program donation dropdown (#3037)
* add program attribute
* update programId
* add program selector on stripe
* add program selector in crypt oform
* daf program selector
* stocks program selector
* absolute dropdown
* add programId in intent creation
* incrementers wrap
* add program flag
* UI flagged
* update tsconfig
* update type import
* dont include type automatically
* prepend general
* use programAllowed flag
* rename constant
* BG-1336: Donate to ap wallet directly (#2978)
* Update Polygon and Ethereum testnets to Amoy and Sepolia (#2937)
* Update Polygon and Ethereum testnets to Amoy and Sepolia
* Format
* BG-1253: Pending Payment donation pickup button (#2940)
* Add 'Finish Paying' to intent table
* Remove redundant endowment fields from Donate page
* Add logic to load intent data into Donate page
* Update intent type to include token + currency + frequency
* Use Currency instead of DetailedCurrency
* Update frequency to 'one-time'+'subscription'
* Show tip as pct
* Remove tx hash column on awaiting payment table
* Reset state.transactionId on component unmount
* Pass transactionId when creating intents
* Pass old intent id in PayPal
* Update endpoint
* Rename intentTransactionId->oldTransactionId
* Add comment
* Rename intentTransactionId->oldTransactionId
* link / col header fixes
---------
Co-authored-by: Andrey
* fix twitter acct handle used
* V3 endowment (#2941)
* BG-1225: Donation success page: Show the name of the nonprofit donor chose (#2869)
* Pass recipientName to DonateFiatThanks from PayPal checkout
* Pass recipientName in StripePaymentStatus
* Donate page: Create PayPal order (donation intent) only on button click (#2873)
* Add new 'intent' don. status
* Create PayPal order (donation intent) only on button click
* Remove redundant isSubmitting state
* Refactor createOrder
* Revert "Add new 'intent' don. status"
This reverts commit 54af8638beaf15ba61ad212a305c9fbd91b24734.
* UI Error handling (#2870)
Closes BG-1263
Closes BG-1172
This PR aims to separate UI error (UI is unusable, display fallback UI) from user-initiated error (e.g. failed submission, prompt with Modal). Kindly see comments for changes explanation
NOTE: renamings, moving of files are not applied yet so that essential changes would stand out.
- [ ] rename `useErrorContext` to `useErrorHandler`
- [ ] move `useErrorHandler` to `/hooks`
- [ ] delete `contexts/ErrorContext`
Sample handled UI errors:
App encountered error