Superfluid develop branch

lang/ca.json

@@ -350,7 +350,7 @@
 	"label.givbacks_rewards": "Recompenses de GIVbacks",
 	"label.givbacks_rewards_corresponding_to_the_current_round": "Les recompenses de GIVbacks corresponents a la ronda actual estan disponibles després que la ronda finalitzi. Si has donat a un projecte verificat i encara no tens recompenses per reclamar, és probable que els GIVbacks no s'hagin distribuït per a aquesta ronda, o que ja hagis reclamat les teves recompenses de GIVbacks.",
 	"label.givbacks_rewards_donors_to_verified_projects": "GIVbacks recompensa els donants de projectes verificats amb GIV, potenciant Giveth com una força del bé impulsada pels donants.",
-	"label.givback_distributed_afer_round": "GIV rewards from the GIVbacks program will be distributed after the end of the current round.",
+	"label.givback_distributed_after_round": "GIV rewards from the GIVbacks program will be distributed after the end of the current round.",
 	"label.give": "Dóna",
 	"label.giveconomy": "GIVeconomy",
 	"label.giveconomy_activities": "Activitats de GIVeconomy",
@@ -1413,5 +1413,40 @@
 	"tooltip.donation.matching": "This estimation is based on the donations made so far this quadratic funding round and is not considering fraud analysis. Actual matching amount vary.",
 	"ubi": "Renta bàsica",
 	"water-and-sanitation": "Aigua i Sanejament",
+	"label.deposit": "dipòsit",
+	"label.how_do_you_want_to_donate": "Com vols donar?",
+	"label.this_feature_will_be_available_soon": "Aquesta funció estarà disponible aviat.",
+	"label.one_time_donation": "Donació Única",
+	"label.recurring_donation": "Donació Recurrent",
+	"label.make_a_recurring_donation_with": "Fes una donació recurrent amb ",
+	"label.provide_continuous_funding_by_streaming_your_donations_over_time": "Proporciona finançament continu fent les teves donacions periòdiques al llarg del temps.",
+	"label.creating_a_monthly_recurring_donation": "Creant una donació recurrent mensual",
+	"label.stream_balance": "Saldo de la Transmissió",
+	"label.select_token": "Selecciona Token",
+	"label.amount_to_donate_monthly": "Quantitat a donar mensualment",
+	"label.donate_to_this_project": "Dona a aquest projecte",
+	"label.per_month": "per Mes",
+	"label.stream_balance_runs_out_in": "El saldo del flux s'esgota en",
+	"label.months": "{count, plural, one { Mes} other { Mesos} }",
+	"label.month": "{count, plural, one { Mes} other { Mesos} }",
+	"label.top_up_stream_balance": "Recarrega el saldo del flux",
+	"label.you_are_supporting_other_projects_with_this_stream": "Estàs recolzant {count} altre projecte amb aquest flux",
+	"label.manage_recurring_donations": "Gestiona donacions recurrents",
+	"label.streams_powered_by": "Fluxos impulsats per",
+	"label.monthly": "Mensualment",
+	"label.donating_percentage_to": "Donant el {percentage} a ",
+	"label.modify_recurring_donation": "Modificar Donació Recurrent",
+	"label.stream_balances": "Saldos de la Transmissió",
+	"label.eligible_tokens": "Tokens Elegibles",
+	"label.you_have_stream_on_all_tokens": "Tens transmissió en tots els tokens",
+	"label.stream_runs_out_in": "El flux s'esgota en",
+	"label.funding_count_projects": "Finançant {count} {count, plural, one { Projecte} other { Projectes} }",
+	"label.recurring_donations_currently_only_available_on_optimism": "Les donacions recurrents actualment només estan disponibles en Optimism",
+	"label.switch_to_network_to_continue_donating": "Canvia a {network} per continuar donant a aquest projecte.",
+	"label.confirm_your_donation": "Confirma la teva donació",
+	"label.approving": "Aprovant",
+	"label.modify_stream_balance": "Modificar el Saldo de la Transmissió",
+	"label.funding": "Finançament",
+	"label.balance_runs_out_in": "El saldo s'esgota en",
 	"label.unfortunately_passport_is_incompatible": "Desafortunadament, Passport no és compatible amb multisigs. Si us plau, intenta-ho amb la teva cartera personal"
 }

lang/en.json

@@ -350,7 +350,7 @@
 	"label.givbacks_rewards": "GIVbacks Rewards",
 	"label.givbacks_rewards_corresponding_to_the_current_round": "GIVbacks rewards corresponding to the current round become available after the round ends. If you donated to a verified project and do not yet have rewards to claim, it is likely that GIVbacks have not yet been distributed for that round, or that you claimed your GIVbacks rewards already.",
 	"label.givbacks_rewards_donors_to_verified_projects": "GIVbacks rewards donors to verified projects with GIV, super-charging Giveth as a donor-driven force for good.",
-	"label.givback_distributed_afer_round": "GIV rewards from the GIVbacks program will be distributed after the end of the current round.",
+	"label.givback_distributed_after_round": "GIV rewards from the GIVbacks program will be distributed after the end of the current round.",
 	"label.give": "Give",
 	"label.giveconomy": "GIVeconomy",
 	"label.giveconomy_activities": "GIVeconomy activities",
@@ -1413,5 +1413,40 @@
 	"tooltip.donation.matching": "This estimation is based on the donations made so far this quadratic funding round and is not considering fraud analysis. Actual matching amount vary.",
 	"ubi": "UBI",
 	"water-and-sanitation": "Water & Sanitation",
+	"label.deposit": "deposit",
+	"label.how_do_you_want_to_donate": "How do you want to donate?",
+	"label.this_feature_will_be_available_soon": "This feature will be available soon.",
+	"label.one_time_donation": "One-Time Donation",
+	"label.recurring_donation": "Recurring Donation",
+	"label.make_a_recurring_donation_with": "Make a recurring donation with ",
+	"label.provide_continuous_funding_by_streaming_your_donations_over_time": "Provide continuous funding by streaming your donations over time.",
+	"label.creating_a_monthly_recurring_donation": "Creating a Monthly recurring donation",
+	"label.stream_balance": "Stream Balance",
+	"label.select_token": "Select Token",
+	"label.amount_to_donate_monthly": "Amount to donate Monthly",
+	"label.donate_to_this_project": "Donate to this project",
+	"label.per_month": "per Month",
+	"label.stream_balance_runs_out_in": "Stream balance runs out in",
+	"label.months": "{count, plural, one { Month} other { Months} }",
+	"label.month": "{count, plural, one { Month} other { Months} }",
+	"label.top_up_stream_balance": "Top-up stream balance",
+	"label.you_are_supporting_other_projects_with_this_stream": "You are supporting {count} other project with this stream",
+	"label.manage_recurring_donations": "Manage recurring donations",
+	"label.streams_powered_by": "Streams powered by",
+	"label.monthly": "Monthly",
+	"label.donating_percentage_to": "Donating {percentage} to ",
+	"label.modify_recurring_donation": "Modify Recurring Donation",
+	"label.stream_balances": "Stream Balances",
+	"label.eligible_tokens": "Tokens Elegibles",
+	"label.you_have_stream_on_all_tokens": "You have stream on all tokens",
+	"label.stream_runs_out_in": "Stream runs out in",
+	"label.funding_count_projects": "Funding {count} {count, plural, one { Project} other { Projects} }",
+	"label.recurring_donations_currently_only_available_on_optimism": "Recurring donations are currently only available on Optimism",
+	"label.switch_to_network_to_continue_donating": "Switch to {network} to continue donating to this project.",
+	"label.confirm_your_donation": "Confirm your donation",
+	"label.approving": "Approving",
+	"label.modify_stream_balance": "Modify Stream Balance",
+	"label.funding": "Funding",
+	"label.balance_runs_out_in": "Balance runs out in",
 	"label.unfortunately_passport_is_incompatible": "Unfortunately Passport is not compatible with Multisigs, sign in with your regular wallet to verify your passport & make QF Donations."
 }

lang/es.json

@@ -350,7 +350,7 @@
 	"label.givbacks_rewards": "Recompensas de GIVbacks",
 	"label.givbacks_rewards_corresponding_to_the_current_round": "Recompensas de GIVbacks correspondientes a la ronda actual se harán disponibles después de que la ronda termine. Si donaste a un proyecto verificado y no tienes recompensas por reclamar, es muy probable que los GIVbacks no hayan sido distribuidos para esa ronda, o que ya hayas reclamado.",
 	"label.givbacks_rewards_donors_to_verified_projects": "GIVbacks recompensa a los donantes de proyectos verificados con GIV, potenciando Giveth como una fuerza del bien impulsada por los donantes.",
-	"label.givback_distributed_afer_round": "GIV rewards from the GIVbacks program will be distributed after the end of the current round.",
+	"label.givback_distributed_after_round": "GIV rewards from the GIVbacks program will be distributed after the end of the current round.",
 	"label.give": "Da",
 	"label.giveconomy": "GIVeconomy",
 	"label.giveconomy_activities": "Actividades en GIVeconomy",
@@ -742,7 +742,6 @@
 	"label.show_your_support": "Muestra tu apoyo al futuro de las donaciones y desbloquea tu estilo único de Giveth minteando una de las primeras piezas NFT PFP inspiradas en Giveth.",
 	"label.sign_in_to_giveth": "Inicia Sesión en Giveth",
 	"label.sign_in_with_ethereum": "Ingresa con Ethereum",
-	"label.sign_in_with_ethereum": "Ingresa con Solana",
 	"label.sign_message": "Firmar Mensaje",
 	"label.sign_out": "Salir",
 	"label.sign_wallet": "Firmar Billetera",
@@ -1413,5 +1412,40 @@
 	"tooltip.donation.matching": "This estimation is based on the donations made so far this quadratic funding round and is not considering fraud analysis. Actual matching amount vary.",
 	"ubi": "UBI",
 	"water-and-sanitation": "Agua & Saneamiento",
+	"label.deposit": "depósito",
+	"label.how_do_you_want_to_donate": "¿Cómo quieres donar?",
+	"label.this_feature_will_be_available_soon": "Esta función estará disponible pronto.",
+	"label.one_time_donation": "Donación Única",
+	"label.recurring_donation": "Donación Recurrente",
+	"label.make_a_recurring_donation_with": "Haz una donación recurrente con ",
+	"label.provide_continuous_funding_by_streaming_your_donations_over_time": "Proporciona financiamiento continuo transmitiendo tus donaciones a lo largo del tiempo.",
+	"label.creating_a_monthly_recurring_donation": "Creando una donación recurrente mensual",
+	"label.stream_balance": "Saldo de Transmisión",
+	"label.select_token": "Seleccionar Token",
+	"label.amount_to_donate_monthly": "Cantidad a donar mensualmente",
+	"label.donate_to_this_project": "Donar a este proyecto",
+	"label.per_month": "por Mes",
+	"label.stream_balance_runs_out_in": "El saldo de la transmisión se agota en",
+	"label.months": "{count, plural, one { Mes} other { Meses} }",
+	"label.month": "{count, plural, one { Mes} other { Meses} }",
+	"label.top_up_stream_balance": "Recargar el saldo de la transmisión",
+	"label.you_are_supporting_other_projects_with_this_stream": "Estás apoyando {count} otro proyecto con esta transmisión",
+	"label.manage_recurring_donations": "Gestionar donaciones recurrentes",
+	"label.streams_powered_by": "Transmisiones potenciadas por",
+	"label.monthly": "Mensualmente",
+	"label.donating_percentage_to": "Donando el {percentage} a ",
+	"label.modify_recurring_donation": "Modificar Donación Recurrente",
+	"label.stream_balances": "Saldos de Transmisión",
+	"label.eligible_tokens": "Tokens Elegibles",
+	"label.you_have_stream_on_all_tokens": "Tienes transmisión en todos los tokens",
+	"label.stream_runs_out_in": "La transmisión se agota en",
+	"label.funding_count_projects": "Financiando {count} {count, plural, one { Proyecto} other { Proyectos} }",
+	"label.recurring_donations_currently_only_available_on_optimism": "Las donaciones recurrentes actualmente solo están disponibles en Optimism",
+	"label.switch_to_network_to_continue_donating": "Cambia a {network} para continuar donando a este proyecto.",
+	"label.confirm_your_donation": "Confirma tu donación",
+	"label.approving": "Aprobando",
+	"label.modify_stream_balance": "Modificar el Saldo de Transmisión",
+	"label.funding": "Financiamiento",
+	"label.balance_runs_out_in": "El saldo se agota en",
 	"label.unfortunately_passport_is_incompatible": "Desafortunadamente, Passport no es compatible con multisigs. Por favor, inténtalo con tu billetera personal."
 }

lang/nt_ca.json

@@ -66,7 +66,7 @@
 	"label.get_your_giveth_name": "Get your Giveth Name.",
 	"label.gitcoin_passport": "Gitcoin Passport",
 	"label.givbacks": "GIVbacks",
-	"label.givback_distributed_afer_round": "GIV rewards from the GIVbacks program will be distributed after the end of the current round.",
+	"label.givback_distributed_after_round": "GIV rewards from the GIVbacks program will be distributed after the end of the current round.",
 	"label.giveconomy": "GIVeconomy",
 	"label.givers_nft": "Givers NFT",
 	"label.givers_pfp_holders": "Givers PFP Holders will be able to claim their own unique ",

lang/nt_es.json

@@ -57,7 +57,7 @@
 	"label.get_rewarded_with": "Get rewarded with up to ",
 	"label.get_your_giveth_name": "Get your Giveth Name.",
 	"label.gitcoin_passport": "Gitcoin Passport",
-	"label.givback_distributed_afer_round": "GIV rewards from the GIVbacks program will be distributed after the end of the current round.",
+	"label.givback_distributed_after_round": "GIV rewards from the GIVbacks program will be distributed after the end of the current round.",
 	"label.giveconomy": "GIVeconomy",
 	"label.givers_nft": "Givers NFT",
 	"label.givers_pfp_holders": "Givers PFP Holders will be able to claim their own unique ",

lang/t_ca.json

@@ -53,7 +53,7 @@
 	"label.get_your_giveth_name": "Obtén el teu nom de Giveth.",
 	"label.gitcoin_passport": "Passaport Gitcoin",
 	"label.givbacks": "GIVbacks",
-	"label.givback_distributed_afer_round": "Les recompenses GIV del programa GIVbacks es distribuiran després de la fi de la ronda actual.",
+	"label.givback_distributed_after_round": "Les recompenses GIV del programa GIVbacks es distribuiran després de la fi de la ronda actual.",
 	"label.giveconomy": "GIVeconomia",
 	"label.givers_pfp_holders": "Els titulars de Givers PFP podran reclamar el seu propi únic ",
 	"label.givpower": "GIVpower",

lang/t_es.json

@@ -44,7 +44,7 @@
 	"label.get_rewarded_with": "Obtén recompensas de hasta ",
 	"label.get_your_giveth_name": "Obtén tu Nombre de Giveth.",
 	"label.gitcoin_passport": "Pasaporte de Gitcoin",
-	"label.givback_distributed_afer_round": "Las recompensas GIV del programa GIVbacks se distribuirán después del final de la ronda actual.",
+	"label.givback_distributed_after_round": "Las recompensas GIV del programa GIVbacks se distribuirán después del final de la ronda actual.",
 	"label.giveconomy": "Economía de Giveth",
 	"label.givers_pfp_holders": "Los titulares de Givers PFP podrán reclamar su propio ",
 	"label.givpower": "GIVpower",

package.json

@@ -18,7 +18,7 @@
 	},
 	"dependencies": {
 		"@apollo/client": "^3.8.3",
-		"@giveth/ui-design-system": "^1.11.17",
+		"@giveth/ui-design-system": "^1.11.19",
 		"@reduxjs/toolkit": "^1.9.5",
 		"@safe-global/api-kit": "^2.0.0",
 		"@segment/snippet": "^4.15.3",
@@ -28,16 +28,17 @@
 		"@solana/wallet-adapter-react-ui": "^0.9.34",
 		"@solana/wallet-adapter-wallets": "^0.19.23",
 		"@solana/web3.js": "^1.87.6",
+		"@superfluid-finance/sdk-core": "^0.6.12",
 		"@uniswap/v3-sdk": "^3.10.0",
 		"@web3auth/sign-in-with-solana": "^3.0.0",
 		"@web3modal/wagmi": "^3.1.0",
 		"apollo-upload-client": "^17.0.0",
 		"base58": "^2.0.1",
 		"bignumber.js": "^9.1.2",
 		"deepmerge": "^4.2.2",
-		"ethers": "^6.7.1",
+		"ethers": "5.7.2",
 		"framer-motion": "^10.12.12",
-		"graphql": "^16.8.0",
+		"graphql": "^16.8.1",
 		"lodash.isequal": "^4.5.0",
 		"lottie-react": "^2.3.1",
 		"next": "^13.5.1",
@@ -76,6 +77,7 @@
 		"@testing-library/react": "^13.3.0",
 		"@types/apollo-upload-client": "^14.1.0",
 		"@types/axios": "^0.14.0",
+		"@types/extract-files": "^8.1.3",
 		"@types/jest": "^28.1.4",
 		"@types/jest-axe": "^3.5.4",
 		"@types/lodash.isequal": "^4.5.5",

pages/test1.tsx

@@ -71,11 +71,10 @@
 		});
 
 	const fetchProjects = async () => {
 		const res = await client.query({
 			query: FETCH_ALL_PROJECTS,
 			fetchPolicy: 'network-only',
 		});
-		console.log('res', res);
 	};
 
 	// console.log('gnosisValues', gnosisValues);

pages/test2.tsx

@@ -1,58 +1,33 @@
-import { useEffect } from 'react';
-import { erc20ABI, useAccount, useContractRead, useNetwork } from 'wagmi';
-import { getContract } from 'wagmi/actions';
-import { formatWeiHelper } from '@/helpers/number';
-import { approveERC20tokenTransfer } from '@/lib/stakingPool';
+import { useState } from 'react';
+import { useAccount, useNetwork } from 'wagmi';
+import { ModifySuperTokenModal } from '@/components/views/donate/ModifySuperToken/ModifySuperTokenModal';
 import config from '@/configuration';
 
 const YourApp = () => {
+	const [showModal, setShowModal] = useState(false);
 	const { address, isConnected, status } = useAccount();
 	const { chain } = useNetwork();
 	const chainId = chain?.id;
-	// console.log('address', address, isConnected, status, chainId);
-	const { data } = useContractRead({
-		address: '0xc916Ce4025Cb479d9BA9D798A80094a449667F5D',
-		abi: erc20ABI,
-		functionName: 'allowance',
-	});
-
-	useEffect(() => {
-		const contract = getContract({
-			address: '0xc916Ce4025Cb479d9BA9D798A80094a449667F5D',
-			abi: erc20ABI,
-		});
-		contract.read
-			.allowance([
-				'0x8F48094a12c8F99d616AE8F3305D5eC73cBAA6b6',
-				'0x632AC305ed88817480d12155A7F1244cC182C298',
-			])
-			.then(res => console.log('Allow', formatWeiHelper(res.toString())));
-	}, []);
-
-	console.log('contractRead', getContract);
 
 	return (
 		<div>
 			<w3m-button />
 			<div>
 				<button
 					onClick={() => {
-						if (!chainId) return;
-						approveERC20tokenTransfer(
-							1000000000000000000n,
-							address!,
-							config.EVM_NETWORKS_CONFIG[chainId]?.GIVPOWER
-								?.LM_ADDRESS!,
-							config.EVM_NETWORKS_CONFIG[chainId]
-								.GIV_TOKEN_ADDRESS!,
-							chainId,
-							false,
-						);
+						setShowModal(true);
 					}}
 				>
-					FUck This Approval stuffs
+					Test Button
 				</button>
 			</div>
+			{showModal && (
+				<ModifySuperTokenModal
+					setShowModal={setShowModal}
+					selectedToken={config.OPTIMISM_CONFIG.SUPER_FLUID_TOKENS[1]}
+					tokenStreams={{}}
+				/>
+			)}
 		</div>
 	);
 };