Merge branch 'develop' into test_coinbase

lang/ca.json

@@ -673,7 +673,7 @@
 	"label.no_results_found": "No s'han trobat resultats",
 	"label.number_of_givers": "# de donants",
 	"label.number_of_rounds": "{rounds} Rondes",
-	"label.number_of_unique_donors": "# de Donacions",
+	"label.number_of_donations": "# de Donacions",
 	"label.number_projects": "{count, plural, one {Projecte} other {Projectes}}",
 	"label.oh_no": "Oh no!",
 	"label.okay_it_sounds_like_your_project_is_not_a_non_profit": "D'acord, sembla que el teu projecte no és una organització sense ànim de lucre registrada. Explica'ns una mica com està estructurada la teva organització.",
@@ -1202,6 +1202,41 @@
 	"label.your_stream_balance": "El teu Saldo de Transmissió de",
 	"label.your_tokens_will_be_locked_for_the_remainder": "Els teus tokens estaran bloquejats pel que queda de la ronda actual +",
 	"label.your_total_donation": "La seva donació total",
+	"label.go_back_to_modify_your_donation": "Torna a modificar la teva donació",
+	"label.scan_to_donate": "Escaneja el codi QR o copia l'adreça per fer la transferència",
+	"label.project_address": "Adreça del projecte",
+	"label.copy_the_mnemo_to_use_in_your_app": "Copia la mnemotècnia per utilitzar a la teva aplicació de cartera.",
+	"label.waiting_for_your_donation": "Esperant la teva donació",
+	"label.remaining_time": "Temps restant",
+	"label.update_qr_code": "Actualitzar codi QR",
+	"label.pending": "Pendent",
+	"label.recipient_address": "Adreça del destinatari",
+	"label.memo": "Memo",
+	"label.please_wait_we_will_update": "Espera, actualitzarem aquesta pantalla en el moment en què detectem la transacció.",
+	"label.you_need_to_submit_your_donation_before_the_timer_runs_out": "Has d'enviar la teva donació abans que s'acabi el temps!",
+	"label.waiting": "Esperant",
+	"label.success": "Èxit",
+	"label.donation_status": "Estat de la donació",
+	"label.qr_code_expired": "El codi QR ha caducat, sol·licita un nou codi QR!",
+	"label.did_the_donation_but_not_confirmed": "He fet la donació però no està confirmada.",
+	"label.raise_a_ticket": "Obre un tiquet",
+	"label.need_a_new_qr_code": "Necessites un nou codi QR?",
+	"label.valid_for": "Vàlid per",
+	"label.new_qr_code_needed": "Si no ho has aconseguit a temps, has de generar un nou codi QR.",
+	"label.please_wait_for_you_donation_to_come_through": "Espera que la teva donació es processi!",
+	"label.please_wait": "Espera",
+	"label.the_community_of_makers": "La comunitat de creadors",
+	"page.project.we_are_supporting_stellar": "Estem donant suport a Stellar",
+	"page.project.donate_with_stellar": "Dona amb Stellar",
+	"page.project.you_can_try_donating": "Pots provar de donar amb les teves monedes a la xarxa Stellar.",
+	"label.try_donating_wuth_stellar": "Prova de donar amb Stellar.",
+	"label.check_donations": "Comprova les donacions",
+	"error.enter_amount": "La quantitat ha de ser superior a 0",
+	"label.enter_the_memo": "Introdueix el memo",
+	"label.be_carefull_some_exchanges": "Ves amb compte! Alguns intercanvis i carteres requereixen Memo per finançar el teu compte. Assegura't d'introduir-ho al formulari si la teva cartera admet un memo.",
+	"label.the_donation_was_successful": "La donació ha estat exitosa",
+	"label.view_details": "Veure detalls",
+	"label.transaction_link": "Enllaç de la transacció",
 	"label.your_transactions_have_been_submitted": "Les teves transaccions s'han enviat",
 	"label.your_withdrawal_from_this_stream_balance_is_being_processed": "La teva retirada d'aquest saldo de transmissió s'està processant.",
 	"label.your_withdrawal_from_this_stream_balance_was_successful": "La teva retirada d'aquest saldo de transmissió ha estat exitosa.",
@@ -1645,5 +1680,10 @@
 	"tooltip.flowrate": "Les donacions recurrents es prenen del teu Saldo de Transmissió. Diposita tokens i mantén el teu saldo per habilitar les donacions recurrents.",
 	"tooltip.withdraw_stream_balance": "Si teniu donacions recurrents actives, el vostre saldo disponible per retirar serà lleugerament inferior al vostre saldo actual.",
 	"ubi": "Renta bàsica",
-	"water-and-sanitation": "Aigua i Sanejament"
+	"water-and-sanitation": "Aigua i Sanejament",
+	"label.sanctioned_wallet": "Adreça Sancionada Detectada!!",
+	"label.sanctioned_wallet_message_part1": "Aquesta adreça ha estat trobada a la llista de sancions dels EUA",
+	"label.sanctioned_wallet_message_part2": "Malauradament, Endaoment no permet que les adreces a la llista de sancions de l'OFAC donin a projectes realitzats per Endaoment. Consulta un altre projecte per fer una donació.",
+	"label.project_card_endaoment_title": "Aquest projecte és gestionat per",
+	"label.project_card_endaoment_subtext": "Aquest projecte és gestionat per Endaoment, que s'encarrega de la conversió i lliurament dels fons fiat al projecte. Endaoment cobra una comissió del 1,5% en les donacions, que es processa fora de l'aplicació de Giveth."
 }

lang/en.json

@@ -604,6 +604,10 @@
 	"label.look_for_the_share_and_get_rewarded": "Look for the 'Share & get rewarded' button to generate links to specific pages across the Giveth site.",
 	"label.make_a_recurring_donation_with": "Make a recurring donation with ",
 	"label.make_it_anonymous": "Make it anonymous",
+	"label.view_all_projects": "View all projects",
+	"label.sanctioned_wallet": "Sanctioned Address Detected !!",
+	"label.sanctioned_wallet_message_part1": "This address has been found on the USA",
+	"label.sanctioned_wallet_message_part2": "sanctioned list.\nUnfortunately, Endaoment does not permit addresses on the\nOFAC sanction list to donate to projects delivered by\nEndaoment. Check out another project to donate to. ",
 	"label.make_it_easier_for_donors_to_find_your_project": "Make it easier for donors to find your project by providing a location.",
 	"label.make_it_unique_and_memorable_to_stand_out_from_other_projects": "Make it unique and memorable to stand out from other projects.",
 	"label.make_sure_your_description_aligns_with_our": "Make sure your description aligns with our ",
@@ -673,7 +677,7 @@
 	"label.no_results_found": "No results found",
 	"label.number_of_givers": "# of givers",
 	"label.number_of_rounds": "{rounds} Rounds",
-	"label.number_of_unique_donors": "# of Donations",
+	"label.number_of_donations": "# of Donations",
 	"label.number_projects": "{count, plural, one { Project} other { Projects} }",
 	"label.oh_no": "Oh no!",
 	"label.okay_it_sounds_like_your_project_is_not_a_non_profit": "Okay, it sounds like your project is not a registered non-profit. Please tell us a bit about how your organization is structured.",
@@ -752,7 +756,7 @@
 	"label.projects_count": "{count, plural, one { Project} other { Projects} }",
 	"label.projects_on_giveth": "Projects on Giveth",
 	"label.project_boosted": "Project boosted!",
-	"label.project_by": "PROJECT BY",
+	"label.project_by": "DELIVERED BY",
 	"label.project_contact": "Project contact",
 	"label.project_details": "Project Details",
 	"label.project_features": "Project features",
@@ -1202,6 +1206,41 @@
 	"label.your_stream_balance": "Your",
 	"label.your_tokens_will_be_locked_for_the_remainder": "Your tokens will be locked for the remainder of the current round + the",
 	"label.your_total_donation": "Your total donation",
+	"label.go_back_to_modify_your_donation": "Go back to modify your donation",
+	"label.scan_to_donate": "Scan the QR code or copy the address to make the transfer",
+	"label.project_address": "Project Address",
+	"label.copy_the_mnemo_to_use_in_your_app": "Copy the mnemonic to use in your wallet app.",
+	"label.waiting_for_your_donation": "Waiting for your donation",
+	"label.remaining_time": "Remaining time",
+	"label.update_qr_code": "Update QR code",
+	"label.pending": "Pending",
+	"label.recipient_address": "Recipient address",
+	"label.memo": "Memo",
+	"label.please_wait_we_will_update": "Please wait, we will update this screen the moment we detect the transaction.",
+	"label.you_need_to_submit_your_donation_before_the_timer_runs_out": "You need to submit your donation before the timer runs out!",
+	"label.waiting": "Waiting",
+	"label.success": "Success",
+	"label.donation_status": "Donation status",
+	"label.qr_code_expired": "QR Code Expired, please request a new QR Code!",
+	"label.did_the_donation_but_not_confirmed": "I did the donation but it's not confirmed.",	
+	"label.raise_a_ticket": "Raise a ticket",
+	"label.need_a_new_qr_code": "Need a new QR code?",
+	"label.valid_for": "Valid for",
+	"label.new_qr_code_needed": "If you didn’t make it in time, you need to generate a new QR code.",
+	"label.please_wait_for_you_donation_to_come_through": "Please wait for your donation to come through!",
+	"label.please_wait": "Please wait",
+	"label.the_community_of_makers": "The community of makers",
+	"page.project.we_are_supporting_stellar": "We are supporting Stellar",
+	"page.project.donate_with_stellar": "Donate with Stellar",
+	"page.project.you_can_try_donating": "You can try donating with your coins on Stellar Network.",
+	"label.try_donating_wuth_stellar": "Try donating with Stellar.",
+	"label.check_donations": "Check Donations",
+	"error.enter_amount": "Amount must be greater than 0",
+	"label.enter_the_memo": "Enter the Memo",
+	"label.be_carefull_some_exchanges": "Be careful!  Some exchanges and wallets requires Memo to fund your account. Make sure to put it in the form if your wallet supports a memo.",
+	"label.the_donation_was_successful": "The donation was successful",
+	"label.view_details": "View details",
+	"label.transaction_link": "Transaction link",
 	"label.your_transactions_have_been_submitted": "Your transactions have been submitted",
 	"label.your_withdrawal_from_this_stream_balance_is_being_processed": "Your withdrawal from this stream balance is being processed.",
 	"label.your_withdrawal_from_this_stream_balance_was_successful": "Your withdrawal from this stream balance was successful.",
@@ -1651,5 +1690,7 @@
 	"label.sign_gnosis_safe": "Sign Gnosis Safe",
 	"label.you_need_to_execute_the_pending_multisig": "You'll need to execute the pending Multisig transaction to complete your log-in to Giveth & proceed to this area",
 	"label.sign_a_message_with_your_safe_signer": "Sign a message with your Safe signer address to continue the log in process",
-	"label.this_is_necessary_to_create_projects": "This is necessary to be able to create projects, manage your profile or use GIVpower."
+	"label.this_is_necessary_to_create_projects": "This is necessary to be able to create projects, manage your profile or use GIVpower.",
+	"label.project_card_endaoment_title": "This project is delivered by",
+	"label.project_card_endaoment_subtext": "This project is delivered by Endaoment, which handles the conversion and delivery of fiat funding to this project. Endaoment charges a 1.5% fee on donations which is processed outside of the Giveth Dapp."
 }

lang/es.json

@@ -673,7 +673,7 @@
 	"label.no_results_found": "No hay resultados",
 	"label.number_of_givers": "# de donantes",
 	"label.number_of_rounds": "{rounds} Rondas",
-	"label.number_of_unique_donors": "# de Donaciones",
+	"label.number_of_donations": "# de Donaciones",
 	"label.number_projects": "{count, plural, one {Proyecto} other {Proyectos}}",
 	"label.oh_no": "¡Oh no!",
 	"label.okay_it_sounds_like_your_project_is_not_a_non_profit": "Bien, parece que tu proyecto no está registrado como organización sin ánimo de lucro. Cuéntanos un poco sobre cómo está estructurada tu organización.",
@@ -1202,6 +1202,41 @@
 	"label.your_stream_balance": "Tu Saldo de Transmisión de ",
 	"label.your_tokens_will_be_locked_for_the_remainder": "Tus tokens estarán bloqueados por el restante de la ronda actual +",
 	"label.your_total_donation": "Su donación total",
+	"label.go_back_to_modify_your_donation": "Regresar para modificar tu donación",
+	"label.scan_to_donate": "Escanea el código QR o copia la dirección para hacer la transferencia",
+	"label.project_address": "Dirección del proyecto",
+	"label.copy_the_mnemo_to_use_in_your_app": "Copia la mnemotecnia para usar en tu aplicación de billetera.",
+	"label.waiting_for_your_donation": "Esperando tu donación",
+	"label.remaining_time": "Tiempo restante",
+	"label.update_qr_code": "Actualizar código QR",
+	"label.pending": "Pendiente",
+	"label.recipient_address": "Dirección del destinatario",
+	"label.memo": "Memo",
+	"label.please_wait_we_will_update": "Por favor espera, actualizaremos esta pantalla en cuanto detectemos la transacción.",
+	"label.you_need_to_submit_your_donation_before_the_timer_runs_out": "¡Necesitas enviar tu donación antes de que el tiempo se acabe!",
+	"label.waiting": "Esperando",
+	"label.success": "Éxito",
+	"label.donation_status": "Estado de la donación",
+	"label.qr_code_expired": "El código QR ha expirado, ¡por favor solicita un nuevo código QR!",
+	"label.did_the_donation_but_not_confirmed": "Hice la donación pero no está confirmada.",
+	"label.raise_a_ticket": "Levantar un ticket",
+	"label.need_a_new_qr_code": "¿Necesitas un nuevo código QR?",
+	"label.valid_for": "Válido por",
+	"label.new_qr_code_needed": "Si no lo lograste a tiempo, necesitas generar un nuevo código QR.",
+	"label.please_wait_for_you_donation_to_come_through": "¡Por favor espera a que tu donación se procese!",
+	"label.please_wait": "Por favor espera",
+	"label.the_community_of_makers": "La comunidad de creadores",
+	"page.project.we_are_supporting_stellar": "Estamos apoyando Stellar",
+	"page.project.donate_with_stellar": "Dona con Stellar",
+	"page.project.you_can_try_donating": "Puedes intentar donar con tus monedas en la red Stellar.",
+	"label.try_donating_wuth_stellar": "Intenta donar con Stellar.",
+	"label.check_donations": "Verificar donaciones",
+	"error.enter_amount": "La cantidad debe ser mayor que 0",
+	"label.enter_the_memo": "Introduce el memo",
+	"label.be_carefull_some_exchanges": "¡Ten cuidado! Algunos intercambios y billeteras requieren Memo para financiar tu cuenta. Asegúrate de ingresarlo en el formulario si tu billetera admite un memo.",
+	"label.the_donation_was_successful": "La donación fue exitosa",
+	"label.view_details": "Ver detalles",
+	"label.transaction_link": "Enlace de la transacción",
 	"label.your_transactions_have_been_submitted": "Tus transacciones han sido enviadas",
 	"label.your_withdrawal_from_this_stream_balance_is_being_processed": "Tu retiro de este saldo de transmisión se está procesando.",
 	"label.your_withdrawal_from_this_stream_balance_was_successful": "Tu retiro de este saldo de transmisión ha sido exitoso.",
@@ -1650,5 +1685,10 @@
 	"label.sign_gnosis_safe": "Firmar Gnosis Safe",
 	"label.you_need_to_execute_the_pending_multisig": "Debes ejecutar la transacción Multisig pendiente para completar tu inicio de sesión en Giveth y proceder a esta área",
 	"label.sign_a_message_with_your_safe_signer": "Firma un mensaje con la dirección de tu firma segura (Safe signer) para continuar el proceso de inicio de sesión",
-	"label.this_is_necessary_to_create_projects": "Esto es necesario para poder crear proyectos, gestionar tu perfil o usar GIVpower."
+	"label.this_is_necessary_to_create_projects": "Esto es necesario para poder crear proyectos, gestionar tu perfil o usar GIVpower.",
+	"label.sanctioned_wallet": "¡Dirección Sancionada Detectada!",
+	"label.sanctioned_wallet_message_part1": "Esta dirección ha sido encontrada en la lista de sanciones de EE.UU.",
+	"label.sanctioned_wallet_message_part2": "Lamentablemente, Endaoment no permite que las direcciones en la lista de sanciones de OFAC donen a proyectos entregados por Endaoment. Consulta otro proyecto para donar.",
+	"label.project_card_endaoment_title": "Este proyecto es gestionado por",
+	"label.project_card_endaoment_subtext": "Este proyecto es gestionado por Endaoment, que se encarga de la conversión y entrega de fondos fiat a este proyecto. Endaoment cobra una comisión del 1,5% en las donaciones, que se procesa fuera de la aplicación de Giveth."
 }

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "givethdapp",
-	"version": "2.29.5",
+	"version": "2.29.7",
 	"private": true,
 	"scripts": {
 		"build": "next build",
@@ -30,6 +30,7 @@
 		"@solana/wallet-adapter-react-ui": "^0.9.35",
 		"@solana/wallet-adapter-wallets": "^0.19.26",
 		"@solana/web3.js": "^1.90.0",
+		"@stellar/stellar-sdk": "^12.2.0",
 		"@superfluid-finance/sdk-core": "^0.7.0",
 		"@tanstack/react-query": "^5.45.1",
 		"@vercel/speed-insights": "^1.0.9",
@@ -47,6 +48,7 @@
 		"next": "^14.2.3",
 		"nprogress": "^0.2.0",
 		"posthog-js": "^1.147.0",
+		"qrcode": "^1.5.3",
 		"quill": "^1.3.7",
 		"quill-emoji": "^0.2.0",
 		"quill-image-resize-module": "^3.0.0",
@@ -85,6 +87,7 @@
 		"@types/lodash.isequal": "^4.5.8",
 		"@types/node": "^20.11.20",
 		"@types/nprogress": "^0.2.3",
+		"@types/qrcode": "^1.5.5",
 		"@types/react": "^18.3.2",
 		"@types/react-custom-scrollbars": "^4.0.13",
 		"@types/react-datepicker": "^6.0.1",

pages/transaction/[id]/index.tsx

@@ -0,0 +1,8 @@
+import React from 'react';
+import TransactionView from '@/components/views/transaction/Transaction.view';
+
+const TransactionRoute = () => {
+	return <TransactionView />;
+};
+
+export default TransactionRoute;

src/apollo/gql/gqlDonations.ts

@@ -188,6 +188,9 @@ export const CREATE_DRAFT_DONATION = gql`
 		$safeTransactionId: String
 		$useDonationBox: Boolean
 		$relevantDonationTxHash: String
+		$toWalletMemo: String
+		$qrCodeDataUrl: String
+		$isQRDonation: Boolean
 	) {
 		createDraftDonation(
 			networkId: $networkId
@@ -201,6 +204,56 @@ export const CREATE_DRAFT_DONATION = gql`
 			safeTransactionId: $safeTransactionId
 			useDonationBox: $useDonationBox
 			relevantDonationTxHash: $relevantDonationTxHash
+			toWalletMemo: $toWalletMemo
+			qrCodeDataUrl: $qrCodeDataUrl
+			isQRDonation: $isQRDonation
 		)
 	}
 `;
+
+export const FETCH_DRAFT_DONATION = gql`
+	query GetDraftDonationById($id: Int!) {
+		getDraftDonationById(id: $id) {
+			id
+			networkId
+			chainType
+			status
+			toWalletAddress
+			fromWalletAddress
+			tokenAddress
+			currency
+			amount
+			createdAt
+			matchedDonationId
+			qrCodeDataUrl
+			toWalletMemo
+			projectId
+			expiresAt
+		}
+	}
+`;
+
+export const MARK_DRAFT_DONATION_AS_FAILED = gql`
+	mutation ($id: Int!) {
+		markDraftDonationAsFailed(id: $id)
+	}
+`;
+
+export const FETCH_DONATION_BY_ID = gql`
+	${DONATION_CORE_FIELDS}
+	query GetDonationById($id: Int!) {
+		getDonationById(id: $id) {
+			...DonationCoreFields
+			isTokenEligibleForGivback
+			fromWalletAddress
+		}
+	}
+`;
+
+export const RENEW_DRAFT_DONATION_EXPIRATION = gql`
+	mutation ($id: Int!) {
+		renewDraftDonationExpirationDate(id: $id) {
+			expiresAt
+		}
+	}
+`;