Merge branch 'develop' of github.com:Giveth/giveth-dapps-v2 into fix_…

…issue_4449_network_modal Update Branch
Giveth · Sep 12, 2024 · db131da · db131da
2 parents 7d78930 + 9020bb9
commit db131da
Show file tree

Hide file tree

Showing 5 changed files with 288 additions and 208 deletions.
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
 		"@tanstack/react-query": "^5.45.1",
 		"@vercel/speed-insights": "^1.0.9",
 		"@web3auth/sign-in-with-solana": "^3.0.0",
-		"@web3modal/wagmi": "^5.0.7",
+		"@web3modal/wagmi": "^5.1.7",
 		"apollo-upload-client": "^18.0.1",
 		"base58": "^2.0.1",
 		"bignumber.js": "^9.1.2",
@@ -72,7 +72,7 @@
 		"swiper": "^11.1.3",
 		"unsplash-js": "^7.0.19",
 		"viem": "^2.16.1",
-		"wagmi": "^2.11.3"
+		"wagmi": "^2.12.10"
 	},
 	"devDependencies": {
 		"@babel/preset-typescript": "^7.23.3",

diff --git a/src/components/GIVeconomyPages/GIVfarm.sc.tsx b/src/components/GIVeconomyPages/GIVfarm.sc.tsx
@@ -49,6 +49,11 @@ export const PoolRow = styled(Row)`
 
 export const ContractRow = styled(Flex)`
 	gap: 8px;
+	color: ${brandColors.cyan[500]};
+	cursor: pointer;
+	&:hover {
+		color: ${brandColors.cyan[300]};
+	}
 `;
 
 export const CopyWrapper = styled.div`

diff --git a/src/components/views/userProfile/donationsTab/recurringTab/RecurringDonationsTable.tsx b/src/components/views/userProfile/donationsTab/recurringTab/RecurringDonationsTable.tsx
@@ -122,11 +122,13 @@ const RecurringDonationTable: FC<RecurringDonationTable> = ({
 					) : (
 						<DonationTableCell>
 							<B color={semanticColors.jade[500]}>
-								{limitFraction(
-									formatUnits(
-										BigInt(donation.flowRate) *
-											ONE_MONTH_SECONDS,
-										18,
+								{formatDonation(
+									limitFraction(
+										formatUnits(
+											BigInt(donation.flowRate) *
+												ONE_MONTH_SECONDS,
+											18,
+										),
 									),
 								)}
 							</B>

diff --git a/src/wagmiConfigs.ts b/src/wagmiConfigs.ts
@@ -1,5 +1,5 @@
 import { cookieStorage, createConfig, createStorage } from 'wagmi';
-import { walletConnect, coinbaseWallet } from '@wagmi/connectors';
+import { walletConnect, coinbaseWallet, safe } from '@wagmi/connectors';
 
 import { createClient, http } from 'viem';
 import configuration from './configuration';
@@ -28,6 +28,9 @@ export const wagmiConfig = createConfig({
 			metadata,
 		}),
 		coinbaseWallet({ appName: 'Giveth', version: '3' }),
+		safe({
+			allowedDomains: [/app.safe.global$/],
+		}),
 	],
 	ssr: true,
 	storage: createStorage({