Fix/bugs and pools adjusts

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "adex-staking-ui",
-	"version": "0.11.13",
+	"version": "0.11.14",
 	"private": true,
 	"engines": {
 		"npm": "use-yarn",

public/locales/en/translation.json

@@ -50,7 +50,7 @@
 		"created": "Created",
 		"status": "Status",
 		"seeOnEtherscan": "See on Etherscan",
-		"tos": "Terms of service",
+		"tos": "Terms and conditions",
 		"labelADXAmount": "ADX amount",
 		"poolWithName": "Pool: {{name}}",
 		"currentAPY": "Current APY",
@@ -72,7 +72,7 @@
 		"NA": "N/A",
 		"tomStakingPool": "Tom Staking Pool",
 		"from": "From",
-		"tomV5": "Tom",
+		"tomV5": "Tom Pool",
 		"jerryV5": "Jerry",
 		"APY": "APY",
 		"withdrawLegacy": "WIthdraw from legacy identity"
@@ -217,7 +217,7 @@
 		"migrationStakePendingRewards": "Stake pending rewards. (<strong> <amount>{{amount}} {{currency}}</amount> </strong>). [Uses more gas]",
 		"stakeWalletBalance": "Stake wallet balance. (<strong> <amount>{{amount}} {{currency}}</amount> </strong>). [Uses more gas]",
 		"migrateNow": "Migrate now",
-		"tosNotConfirmed": "Confirm terms of service",
+		"tosNotConfirmed": "Confirm terms and conditions",
 		"unbond": "Unbond",
 		"unbondNow": "Unbond now",
 		"bondInfo": "<box>Bond amount: <strong> <amount> {{amount}} {{currency}} </amount> </strong> </box> <box>Pool: {{pool}}</box> <box> Created: {{created}} </box> <box> Migration bonus: <strong> <amount> {{migrationBonus}} {{migrationBonusCurrency}} </amount> </strong></box>",
@@ -323,7 +323,8 @@
 		"userGuide": "User Guide",
 		"sourceCode": "Source Code",
 		"audits": "Audits",
-		"whereToBuy": "Where to buy ADX"
+		"whereToBuy": "Where to buy ADX",
+		"contactUs": "Contact us"
 	},
 	"legacy": {
 		"p1": "The ADX token completed a <external> successful upgrade </external> to a new smart contract. You are currently holding <strong> {{amount}} </strong> legacy ADX",
@@ -336,7 +337,7 @@
 	},
 	"popups": {
 		"congratulations": "Congratulations!",
-		"proudOwnerOfADX": "You are the proud owner of the new ADX token. You can stake them right away to receive rewards",
+		"proudOwnerOfADX": "You are the proud owner of the ADX token. You can stake them right away to receive rewards",
 		"migrationAlert": " Migration Alert",
 		"migrationAlertInfoMigrate": "You have Tom staking pool bond ready to be migrated!",
 		"migrationAlertInfoMigrate_plural": "You have Tom staking pool bonds ready to be migrated!",

public/locales/zh/translation.json

@@ -11,7 +11,7 @@
 		"homePageAndCalculator": "主页和计算器",
 		"termsAndConditions": "条款和条件",
 		"claim": "提取",
-		"tom": "Tom",
+		"tom": "Tom Pool",
 		"loPo": "积分池",
 		"liPo": "流动资金池",
 		"validatorTom": "验证者Tom",

src/components/DepositForm.js

@@ -415,12 +415,11 @@ export default function DepositForm({
 							</Grid>
 						</Grid>
 						<CustomTextField
-							disabled={!confirmed}
 							fullWidth
 							id={`new-${actionType}-form-amount-field`}
 							required
 							label={t("common.labelADXAmount")}
-							type="text"
+							type="number"
 							variant="outlined"
 							value={actionAmount}
 							error={dirtyInputs && amountErr}

src/components/EmailSignUpCard.js

@@ -153,7 +153,12 @@ export default function EmailSignUp(props) {
 								</FormGroup>
 							</FormControl>
 						</Box> */}
-					<Box width={1} mt={3} display="flex" justifyContent="center">
+					<Box
+						m="auto 0 10px 0"
+						width={1}
+						display="flex"
+						justifyContent="center"
+					>
 						<CustomButton
 							btnType="outline"
 							type="submit"

src/components/HelperMenu.js

@@ -73,6 +73,14 @@ export const Help = () => {
 				>
 					<MenuItem onClick={closeHelpMenu}>{t("help.whereToBuy")}</MenuItem>
 				</Link>
+				<Link
+					id="help-menu-external-link-adex-contact-us"
+					color="inherit"
+					href="https://help.adex.network/hc/en-us/requests/new"
+					target="_blank"
+				>
+					<MenuItem onClick={closeHelpMenu}>{t("help.contactUs")}</MenuItem>
+				</Link>
 			</Menu>
 		</>
 	)

src/components/LangSelect.js

@@ -1,6 +1,7 @@
 import React from "react"
-import { Button, Menu, MenuItem } from "@material-ui/core"
+import { Button, Menu, MenuItem, SvgIcon } from "@material-ui/core"
 import { useTranslation } from "react-i18next"
+import { ReactComponent as GlobeIcon } from "./../resources/globe_icon.svg"
 
 const locales = {
 	en: {
@@ -35,6 +36,9 @@ export default function LangSelect() {
 				onClick={handleClick}
 				style={{ textTransform: "capitalize" }}
 			>
+				<SvgIcon style={{ marginRight: "5px", opacity: 0.8 }}>
+					<GlobeIcon />
+				</SvgIcon>
 				{(locales[language] || {}).value || "en"}
 			</Button>
 			<Menu

src/components/PoolCard.js

@@ -114,7 +114,7 @@ export default function PoolCard({
 					</SvgIcon>
 				</Box>
 			) : (
-				<Box>
+				<Box display="flex" flexDirection="column" height="100%">
 					<CardRow
 						color="text.main"
 						fontWeight={"fontWeightRegular"}
@@ -261,7 +261,7 @@ export default function PoolCard({
 					)}
 
 					<Tooltip title={disabled ? disabledInfo : ""}>
-						<div>
+						<div style={{ margin: "auto 0 10px 0" }}>
 							{actionBtn || (
 								<Button
 									id={`stake-pool-${id}`}

src/components/Pools.js

@@ -102,7 +102,7 @@ const Pools = () => {
 						lockupPeriod={t("pools.unbondPeriodDay", {
 							count: TOM_V5_POOL.lockupPeriod
 						})}
-						statsPath={`/stats?validator=${t(TOM_V5_POOL.label)}`}
+						// statsPath={`/stats?validator=${t(TOM_V5_POOL.label)}`}
 						actionBtn={
 							<DepositsDialog
 								id="staking-pool-tom-deposit-form-card"

src/components/Rewards.js

@@ -286,7 +286,7 @@ export default function Rewards() {
 					{t("common.rewards")}
 				</Typography>
 			</Box>
-			<Box display="flex" flexDirection="row">
+			{/* <Box display="flex" flexDirection="row">
 				<Box
 					m={1}
 					py={3}
@@ -339,7 +339,7 @@ export default function Rewards() {
 						)}
 					</Box>
 				</Box> */}
-			</Box>
+			{/* </Box> */}
 
 			<Box maxWidth="56rem">
 				<Box p={2}>

src/components/WithDialog.js

@@ -179,9 +179,9 @@ export default function WithDialogHoc(Decorated) {
 						}}
 					>
 						<Typography variant="h4">{title}</Typography>
-						{/* <IconButton onClick={handleToggle} size="small">
+						<IconButton onClick={handleToggle} size="small">
 							<CancelIcon />
-						</IconButton> */}
+						</IconButton>
 					</DialogTitle>
 					<DialogContent classes={{ root: classes.content }}>
 						<Decorated ref={forwardedRef} {...rest} closeDialog={closeDialog} />