Merge pull request #2426 from Giveth/develop

HOTFIX: xDAI token balance not appearing

lang/en.json

@@ -987,7 +987,7 @@
 	"label.get_giv_token": "Get GIV Token",
 	"label.use_your_giv": "Use your GIV",
 	"label.explore_by": "Explore by",
-	"label.by_category": "by category",
+	"label.category": "category",
 	"label.proud_of_our_partners": "Proud of our partners",
 	"label.awesome_project_updates": "Awesome Project Updates",
 	"label.amount_to_stake": "Amount to stake",
@@ -1058,7 +1058,7 @@
 	"label.oldest": "Oldest",
 	"label.most_liked": "Most liked",
 	"label.most_funded": "Most funded",
-	"label.recently_updated": "RecentlyUpdated",
+	"label.recently_updated": "Recently Updated",
 	"label.sort_by": "Sort by",
 	"label.an_economy_of_giving": "An Economy of Giving",
 	"label.governance": "Governance",

lang/es.json

@@ -994,7 +994,7 @@
 	"label.get_giv_token": "Obtén GIV Tokens",
 	"label.use_your_giv": "Utiliza tu GIV",
 	"label.explore_by": "Explorar por",
-	"label.by_category": "Por Categoría",
+	"label.category": "Categoría",
 	"label.proud_of_our_partners": "Orgullosos de nuestros socios",
 	"label.awesome_project_updates": "Actualizaciones Geniales de Proyectos",
 	"label.amount_to_stake": "Monto para stake",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "givethdapp",
-	"version": "2.12.1",
+	"version": "2.12.2",
 	"private": true,
 	"scripts": {
 		"build": "next build",

src/components/menu/ProjectsItems.tsx

@@ -13,6 +13,7 @@ import Routes from '@/lib/constants/Routes';
 const projectsItems = {
 	explore: [
 		// { name: 'Trending', query: '?q=?q=trending' },
+		{ name: 'All Projects', query: '', label: 'label.all_projects' },
 		{
 			name: 'Recently Updated',
 			query: '?sort=' + EProjectsSortBy.RECENTLY_UPDATED,
@@ -24,7 +25,6 @@ const projectsItems = {
 			label: 'label.just_launched',
 		},
 		// { name: 'Popular', query: '?q=popular' },
-		{ name: 'All Projects', query: '', label: 'label.all_projects' },
 	],
 };
 
@@ -59,9 +59,7 @@ export const ProjectsItems: FC<IProjectsItems> = ({ inSidebar = false }) => {
 				</ExploreByRow>
 			</HighlightSection>
 			<NormalSection inSidebar={inSidebar}>
-				<Label medium>
-					{formatMessage({ id: 'label.by_category' })}
-				</Label>
+				<Label medium>{formatMessage({ id: 'label.category' })}</Label>
 				<CategoriesGrid inSidebar={inSidebar}>
 					{mainCategories.map((category, idx) => (
 						<Link

src/components/views/donate/CryptoDonation.tsx

@@ -192,11 +192,15 @@ const CryptoDonation: FC = () => {
 			return setSelectedTokenBalance(undefined);
 		}
 		// Native token balance is provided by the Web3Provider
+		const _selectedTokenSymbol = selectedToken.symbol.toUpperCase();
 		if (
-			selectedToken.symbol === ethereumChain.nativeCurrency.symbol ||
-			selectedToken.symbol === gnosisChain.nativeCurrency.symbol ||
-			selectedToken.symbol === polygonChain.nativeCurrency.symbol
-			// TODO:Optimism || selectedToken.symbol === optimismChain.nativeCurrency.symbol
+			_selectedTokenSymbol ===
+				ethereumChain.nativeCurrency.symbol.toUpperCase() ||
+			_selectedTokenSymbol ===
+				gnosisChain.nativeCurrency.symbol.toUpperCase() ||
+			_selectedTokenSymbol ===
+				polygonChain.nativeCurrency.symbol.toUpperCase()
+			// TODO:Optimism || _selectedTokenSymbol === optimismChain.nativeCurrency.symbol
 		) {
 			return setSelectedTokenBalance(balance);
 		}

src/helpers/blockchain.ts

@@ -21,7 +21,7 @@ export const networksParams: {
 		],
 		nativeCurrency: {
 			name: 'xDAI',
-			symbol: 'xDAI',
+			symbol: 'XDAI',
 			decimals: 18,
 		},
 		blockExplorerUrls: ['https://blockscout.com/xdai/mainnet'],