diff --git a/packages/wallet-ui/src/components/pages/Home/Home.view.tsx b/packages/wallet-ui/src/components/pages/Home/Home.view.tsx
index d1a43f05..091a6a5c 100644
--- a/packages/wallet-ui/src/components/pages/Home/Home.view.tsx
+++ b/packages/wallet-ui/src/components/pages/Home/Home.view.tsx
@@ -17,22 +17,20 @@ export const HomeView = ({ address }: Props) => {
const { translate } = useMultiLanguage();
return (
- translate && (
-
-
-
- {!upgradeModalVisible &&
- Object.keys(erc20TokenBalanceSelected).length > 0 && (
-
- )}
- {!upgradeModalVisible && }
- {!upgradeModalVisible &&
- Object.keys(transactions).length === 0 &&
- !loader.isLoading && (
- {translate('noTransactions')}
- )}
-
-
- )
+
+
+
+ {!upgradeModalVisible &&
+ Object.keys(erc20TokenBalanceSelected).length > 0 && (
+
+ )}
+ {!upgradeModalVisible && }
+ {!upgradeModalVisible &&
+ Object.keys(transactions).length === 0 &&
+ !loader.isLoading && (
+ {translate('noTransactions')}
+ )}
+
+
);
};
diff --git a/packages/wallet-ui/src/components/ui/Framework/Framework.view.tsx b/packages/wallet-ui/src/components/ui/Framework/Framework.view.tsx
index 8c14f6ec..42dfd487 100644
--- a/packages/wallet-ui/src/components/ui/Framework/Framework.view.tsx
+++ b/packages/wallet-ui/src/components/ui/Framework/Framework.view.tsx
@@ -20,20 +20,18 @@ export const FrameworkView = ({ connected, children }: Props) => {
const { translate } = useMultiLanguage();
return (
- translate && (
-
-
-
- {children}
-
-
- {bannerOpen && (
-
- {translate('openBetaVersion')}{' '}
- setBannerOpen(false)} />
-
- )}
-
- )
+
+
+
+ {children}
+
+
+ {bannerOpen && (
+
+ {translate('openBetaVersion')}{' '}
+ setBannerOpen(false)} />
+
+ )}
+
);
};
diff --git a/packages/wallet-ui/src/components/ui/atom/LoadingSmall/LoadingSmall.view.tsx b/packages/wallet-ui/src/components/ui/atom/LoadingSmall/LoadingSmall.view.tsx
index 52204628..2ed43b24 100644
--- a/packages/wallet-ui/src/components/ui/atom/LoadingSmall/LoadingSmall.view.tsx
+++ b/packages/wallet-ui/src/components/ui/atom/LoadingSmall/LoadingSmall.view.tsx
@@ -8,11 +8,9 @@ export const LoadingSmallView = ({ ...otherProps }: Props) => {
const { translate } = useMultiLanguage();
return (
- translate && (
-
-
- {translate('loading')}
-
- )
+
+
+ {translate('loading')}
+
);
};
diff --git a/packages/wallet-ui/src/components/ui/molecule/AccountAddress/AccountAddress.view.tsx b/packages/wallet-ui/src/components/ui/molecule/AccountAddress/AccountAddress.view.tsx
index 16d5ebb7..a1daab0b 100644
--- a/packages/wallet-ui/src/components/ui/molecule/AccountAddress/AccountAddress.view.tsx
+++ b/packages/wallet-ui/src/components/ui/molecule/AccountAddress/AccountAddress.view.tsx
@@ -23,32 +23,30 @@ export const AccountAddressView = ({
const { translate } = useMultiLanguage();
return (
- translate && (
- <>
+ <>
+
-
-
- {full
- ? starkName ?? address
- : starkName
- ? shortenDomain(starkName)
- : shortenAddress(address)}
-
-
+ {full
+ ? starkName ?? address
+ : starkName
+ ? shortenDomain(starkName)
+ : shortenAddress(address)}
+
- >
- )
+
+ >
);
};
diff --git a/packages/wallet-ui/src/components/ui/molecule/DropDown/DropDown.view.tsx b/packages/wallet-ui/src/components/ui/molecule/DropDown/DropDown.view.tsx
index 11785895..d1ff00a0 100644
--- a/packages/wallet-ui/src/components/ui/molecule/DropDown/DropDown.view.tsx
+++ b/packages/wallet-ui/src/components/ui/molecule/DropDown/DropDown.view.tsx
@@ -25,20 +25,18 @@ export const DropDownView = ({
const { translate } = useMultiLanguage();
return (
- translate && (
-
-
-
+
+
+
- {helperText && {helperText}}
-
- )
+ {helperText && {helperText}}
+
);
};
diff --git a/packages/wallet-ui/src/components/ui/molecule/TransactionsList/TransactionListItem/TransactionListItem.view.tsx b/packages/wallet-ui/src/components/ui/molecule/TransactionsList/TransactionListItem/TransactionListItem.view.tsx
index fd85acbd..ba4fc311 100644
--- a/packages/wallet-ui/src/components/ui/molecule/TransactionsList/TransactionListItem/TransactionListItem.view.tsx
+++ b/packages/wallet-ui/src/components/ui/molecule/TransactionsList/TransactionListItem/TransactionListItem.view.tsx
@@ -79,39 +79,37 @@ export const TransactionListItemView = ({ transaction }: Props) => {
const txnToFromLabel = '';
const txnFailureReason = getTxnFailureReason(transaction);
return (
- translate && (
-
- openExplorerTab(transaction.txnHash, 'tx', transaction.chainId)
- }
- >
-
-
-
-
-
-
-
- {txnDate}
-
-
- {txnStatus}
- {txnFailureReason}
-
-
-
-
- {txnToFromLabel}
-
- {txnName === 'Send' && (
-
- )}
-
-
- )
+
+ openExplorerTab(transaction.txnHash, 'tx', transaction.chainId)
+ }
+ >
+
+
+
+
+
+
+
+ {txnDate}
+
+
+ {txnStatus}
+ {txnFailureReason}
+
+
+
+
+ {txnToFromLabel}
+
+ {txnName === 'Send' && (
+
+ )}
+
+
);
};
diff --git a/packages/wallet-ui/src/components/ui/organism/AccountDetailsModal/AccountDetailsModal.view.tsx b/packages/wallet-ui/src/components/ui/organism/AccountDetailsModal/AccountDetailsModal.view.tsx
index fb68ba98..ac5e3416 100644
--- a/packages/wallet-ui/src/components/ui/organism/AccountDetailsModal/AccountDetailsModal.view.tsx
+++ b/packages/wallet-ui/src/components/ui/organism/AccountDetailsModal/AccountDetailsModal.view.tsx
@@ -24,36 +24,34 @@ export const AccountDetailsModalView = ({ address }: Props) => {
const chainId = networks?.items[networks.activeNetwork]?.chainId;
return (
- translate && (
-
-
-
-
-
-
- {translate('myAccount')}
- {/* */}
-
-
-
-
-
- openExplorerTab(address, 'contract', chainId)}
- >
- {translate('viewOnExplorer').toUpperCase()}
-
- getPrivateKeyFromAddress(address, chainId)}
- >
- {translate('exportPrivateKey')}
-
-
-
- )
+
+
+
+
+
+
+ {translate('myAccount')}
+ {/* */}
+
+
+
+
+
+ openExplorerTab(address, 'contract', chainId)}
+ >
+ {translate('viewOnExplorer').toUpperCase()}
+
+ getPrivateKeyFromAddress(address, chainId)}
+ >
+ {translate('exportPrivateKey')}
+
+
+
);
};
diff --git a/packages/wallet-ui/src/components/ui/organism/AddTokenModal/AddTokenModal.view.tsx b/packages/wallet-ui/src/components/ui/organism/AddTokenModal/AddTokenModal.view.tsx
index e69ccfe9..38bd9798 100644
--- a/packages/wallet-ui/src/components/ui/organism/AddTokenModal/AddTokenModal.view.tsx
+++ b/packages/wallet-ui/src/components/ui/organism/AddTokenModal/AddTokenModal.view.tsx
@@ -51,80 +51,74 @@ export const AddTokenModalView = ({ closeModal }: Props) => {
}, [fields, isValidAddress]);
return (
- translate && (
- <>
-
- {translate('addToken')}
-
-
-
- handleChange('address', event.target.value)}
- setIsValidAddress={setIsValidAddress}
- />
-
-
- handleChange('name', event.target.value)}
- />
-
-
- handleChange('symbol', event.target.value)}
- />
-
-
-
- handleChange(
- 'decimal',
- isNaN(Number(event.target.value)) ? '' : event.target.value,
- )
+ <>
+
+ {translate('addToken')}
+
+
+
+ handleChange('address', event.target.value)}
+ setIsValidAddress={setIsValidAddress}
+ />
+
+
+ handleChange('name', event.target.value)}
+ />
+
+
+ handleChange('symbol', event.target.value)}
+ />
+
+
+
+ handleChange(
+ 'decimal',
+ isNaN(Number(event.target.value)) ? '' : event.target.value,
+ )
+ }
+ />
+
+
+
+
+ {translate('cancel')}
+
+ {
+ try {
+ const newToken = await addErc20Token(
+ fields.address,
+ fields.name,
+ fields.symbol,
+ parseFloat(fields.decimal),
+ chain,
+ accounts[0] as unknown as string,
+ );
+ if (newToken) {
+ setErc20TokenBalance(newToken);
+ toastr.success(translate('tokenAddedSuccessfully'));
}
- />
-
-
-
-
- {translate('cancel')}
-
- {
- try {
- const newToken = await addErc20Token(
- fields.address,
- fields.name,
- fields.symbol,
- parseFloat(fields.decimal),
- chain,
- accounts[0] as unknown as string,
- );
- if (newToken) {
- setErc20TokenBalance(newToken);
- toastr.success(translate('tokenAddedSuccessfully'));
- }
- closeModal();
- } catch (err) {
- toastr.error(translate('errorAddingToken'));
- }
- }}
- >
- {translate('add')}
-
-
- >
- )
+ closeModal();
+ } catch (err) {
+ toastr.error(translate('errorAddingToken'));
+ }
+ }}
+ >
+ {translate('add')}
+
+
+ >
);
};
diff --git a/packages/wallet-ui/src/components/ui/organism/ConnectInfoModal/ConnectInfoModal.view.tsx b/packages/wallet-ui/src/components/ui/organism/ConnectInfoModal/ConnectInfoModal.view.tsx
index a6fa3c40..a5e3f85b 100644
--- a/packages/wallet-ui/src/components/ui/organism/ConnectInfoModal/ConnectInfoModal.view.tsx
+++ b/packages/wallet-ui/src/components/ui/organism/ConnectInfoModal/ConnectInfoModal.view.tsx
@@ -16,33 +16,31 @@ export const ConnectInfoModalView = ({ address, onButtonClick }: Props) => {
const { translate } = useMultiLanguage();
return (
- translate && (
-
-
-
- {translate('network')}
- {networks.items[networks.activeNetwork].name}
-
-
- {translate('starknetAccount')}
- {address}
-
-
-
-
-
-
-
- )
+
+
+
+ {translate('network')}
+ {networks.items[networks.activeNetwork].name}
+
+
+ {translate('starknetAccount')}
+ {address}
+
+
+
+
+
+
+
);
};
diff --git a/packages/wallet-ui/src/components/ui/organism/ConnectModal/ConnectModal.view.tsx b/packages/wallet-ui/src/components/ui/organism/ConnectModal/ConnectModal.view.tsx
index f7445019..f543da44 100644
--- a/packages/wallet-ui/src/components/ui/organism/ConnectModal/ConnectModal.view.tsx
+++ b/packages/wallet-ui/src/components/ui/organism/ConnectModal/ConnectModal.view.tsx
@@ -23,31 +23,26 @@ export const ConnectModalView = () => {
};
return (
- translate && (
-
-
-
- {translate('connectTo')} MetaMask
-
- Starknet Snap
-
-
- {translate('starknetSnapInstallationPrompt')}
-
-
- {translate('whatIsASnap')}
- {translate('snapsExtendMetaMask')}
-
- {translate('readMore')}
-
-
- }
- onClick={connectToSnap}
- >
- {translate('connectWithMetaMask')}
-
-
- )
+
+
+
+ {translate('connectTo')} MetaMask
+
+ Starknet Snap
+
+
+ {translate('starknetSnapInstallationPrompt')}
+
+
+ {translate('whatIsASnap')}
+ {translate('snapsExtendMetaMask')}
+
+ {translate('readMore')}
+
+
+ } onClick={connectToSnap}>
+ {translate('connectWithMetaMask')}
+
+
);
};
diff --git a/packages/wallet-ui/src/components/ui/organism/DeployModal/DeployModal.view.tsx b/packages/wallet-ui/src/components/ui/organism/DeployModal/DeployModal.view.tsx
index add18427..8ebd2c11 100644
--- a/packages/wallet-ui/src/components/ui/organism/DeployModal/DeployModal.view.tsx
+++ b/packages/wallet-ui/src/components/ui/organism/DeployModal/DeployModal.view.tsx
@@ -84,69 +84,59 @@ export const DeployModalView = ({ address }: Props) => {
switch (stage) {
case Stage.INIT:
return (
- translate && (
- <>
-
- {translate('nonZeroBalanceOnCairo0')}
-
-
-
-
-
-
- {translate('deploymentNecessaryToProceedPart1')}
-
- {translate('deploymentNecessaryToProceedPart2')}
-
- {translate('deploymentNecessaryToProceedPart3')}
-
- Deploy
- >
- )
+ <>
+
+ {translate('nonZeroBalanceOnCairo0')}
+
+
+
+
+
+
+ {translate('deploymentNecessaryToProceedPart1')}
+
+ {translate('deploymentNecessaryToProceedPart2')}
+
+ {translate('deploymentNecessaryToProceedPart3')}
+
+ Deploy
+ >
);
case Stage.WAITING_FOR_TXN:
return (
- translate && (
-
- {translate('waitingForTransaction')}
-
- )
+
+ {translate('waitingForTransaction')}
+
);
case Stage.SUCCESS:
return (
- translate && (
-
- {translate('accountDeployedSuccessfully')}
-
- )
+
+ {translate('accountDeployedSuccessfully')}
+
);
default:
return (
- translate && (
-
- {translate('transactionHash')}
{' '}
- openExplorerTab(txnHash, 'tx', chainId)}>
- {shortenAddress(txnHash)}{' '}
-
-
- {translate('deployTransactionPendingPart1')}
-
- {translate('deployTransactionPendingPart2')}
-
- {translate('deployTransactionPendingPart3')}
-
- )
+
+ {translate('transactionHash')}
{' '}
+ openExplorerTab(txnHash, 'tx', chainId)}>
+ {shortenAddress(txnHash)}{' '}
+
+
+ {translate('deployTransactionPendingPart1')}
+
+ {translate('deployTransactionPendingPart2')}
+
+ {translate('deployTransactionPendingPart3')}
+
);
}
};
return (
- translate && (
-
-
- {translate('deployAccount')}
- {renderComponent()}
-
- )
+
+
+ {translate('deployAccount')}
+ {renderComponent()}
+
);
};
diff --git a/packages/wallet-ui/src/components/ui/organism/Footer/Footer.view.tsx b/packages/wallet-ui/src/components/ui/organism/Footer/Footer.view.tsx
index cd2d62da..1a1ab92e 100644
--- a/packages/wallet-ui/src/components/ui/organism/Footer/Footer.view.tsx
+++ b/packages/wallet-ui/src/components/ui/organism/Footer/Footer.view.tsx
@@ -13,26 +13,21 @@ export const FooterView = () => {
const { translate } = useMultiLanguage();
return (
- translate && (
- <>
-
- {translate('poweredBy')}
- MetaMask Snaps
+ <>
+
+ {translate('poweredBy')}
+ MetaMask Snaps
-
- ©{currentYr} Consensys
-
- {translate('termsOfUse')}
-
-
- {translate('privacyPolicy')}
-
-
-
- >
- )
+
+ ©{currentYr} Consensys
+
+ {translate('termsOfUse')}
+
+
+ {translate('privacyPolicy')}
+
+
+
+ >
);
};
diff --git a/packages/wallet-ui/src/components/ui/organism/Header/Header.view.tsx b/packages/wallet-ui/src/components/ui/organism/Header/Header.view.tsx
index bb555089..faac3f56 100644
--- a/packages/wallet-ui/src/components/ui/organism/Header/Header.view.tsx
+++ b/packages/wallet-ui/src/components/ui/organism/Header/Header.view.tsx
@@ -62,36 +62,34 @@ export const HeaderView = ({ address }: Props) => {
};
return (
- translate && (
-
-
-
- setReceiveOpen(true)}>
- {translate('receive')}
-
-
-
-
-
-
-
- setSendOpen(false)} />
-
-
- )
+
+
+
+ setReceiveOpen(true)}>
+ {translate('receive')}
+
+
+
+
+
+
+
+ setSendOpen(false)} />
+
+
);
};
diff --git a/packages/wallet-ui/src/components/ui/organism/Header/ReceiveModal/ReceiveModal.view.tsx b/packages/wallet-ui/src/components/ui/organism/Header/ReceiveModal/ReceiveModal.view.tsx
index fc9900e4..58b46800 100644
--- a/packages/wallet-ui/src/components/ui/organism/Header/ReceiveModal/ReceiveModal.view.tsx
+++ b/packages/wallet-ui/src/components/ui/organism/Header/ReceiveModal/ReceiveModal.view.tsx
@@ -14,12 +14,10 @@ export const ReceiveModalView = ({ address }: Props) => {
const { translate } = useMultiLanguage();
return (
- translate && (
-
- {translate('receive')}
-
-
-
- )
+
+ {translate('receive')}
+
+
+
);
};
diff --git a/packages/wallet-ui/src/components/ui/organism/Header/SendModal/SendModal.view.tsx b/packages/wallet-ui/src/components/ui/organism/Header/SendModal/SendModal.view.tsx
index d3bdf260..3a9fa90d 100644
--- a/packages/wallet-ui/src/components/ui/organism/Header/SendModal/SendModal.view.tsx
+++ b/packages/wallet-ui/src/components/ui/organism/Header/SendModal/SendModal.view.tsx
@@ -129,87 +129,83 @@ export const SendModalView = ({ closeModal }: Props) => {
};
return (
- translate && (
- <>
- {!summaryModalOpen && (
-
-
-
-
- {translate('network')}
- {networks.items[networks.activeNetwork].name}
-
-
- handleChange('address', value.target.value)
- }
- disableValidate
- validateError={errors.address}
+ <>
+ {!summaryModalOpen && (
+
+
+
+
+ {translate('network')}
+ {networks.items[networks.activeNetwork].name}
+
+ handleChange('address', value.target.value)}
+ disableValidate
+ validateError={errors.address}
+ />
+ {isValidStarkName(fields.address) && resolvedAddress && (
+ {shortenAddress(resolvedAddress, 12)}
+ )}
+
+
+
+ handleChange('amount', value)}
+ error={errors.amount !== '' ? true : false}
+ helperText={errors.amount}
+ decimalsMax={wallet.erc20TokenBalanceSelected.decimals}
+ asset={wallet.erc20TokenBalanceSelected}
+ />
+
+
+
+
({
+ label: token,
+ value: token,
+ }))}
+ onChange={(e) => handleChange('feeToken', e.value)}
/>
- {isValidStarkName(fields.address) && resolvedAddress && (
- {shortenAddress(resolvedAddress, 12)}
- )}
-
-
-
- handleChange('amount', value)}
- error={errors.amount !== '' ? true : false}
- helperText={errors.amount}
- decimalsMax={wallet.erc20TokenBalanceSelected.decimals}
- asset={wallet.erc20TokenBalanceSelected}
- />
-
-
-
- ({
- label: token,
- value: token,
- }))}
- onChange={(e) => handleChange('feeToken', e.value)}
- />
-
-
-
-
- {translate('cancel')}
-
- setSummaryModalOpen(true)}
- enabled={confirmEnabled()}
- >
- {translate('confirm')}
-
-
-
- )}
+
+
+
+
+ {translate('cancel')}
+
+ setSummaryModalOpen(true)}
+ enabled={confirmEnabled()}
+ >
+ {translate('confirm')}
+
+
+
+ )}
- {summaryModalOpen && (
-
- )}
- >
- )
+ {summaryModalOpen && (
+
+ )}
+ >
);
};
diff --git a/packages/wallet-ui/src/components/ui/organism/Header/SendSummaryModal/SendSummaryModal.view.tsx b/packages/wallet-ui/src/components/ui/organism/Header/SendSummaryModal/SendSummaryModal.view.tsx
index 11defa33..e3baf5b1 100644
--- a/packages/wallet-ui/src/components/ui/organism/Header/SendSummaryModal/SendSummaryModal.view.tsx
+++ b/packages/wallet-ui/src/components/ui/organism/Header/SendSummaryModal/SendSummaryModal.view.tsx
@@ -235,105 +235,99 @@ export const SendSummaryModalView = ({
};
return (
- translate && (
-
-
-
- To
- {shortenAddress(address)}
-
+
+
+ To
+ {shortenAddress(address)}
+
+
+
+
+ {translate('gasFeesDefinition')}
+
+
+
+ }
+ >
+ {translate('estimatedFee')}
+
+
+
+ {estimatingGas && }
+ {!estimatingGas && (
+ <>
+
+ {gasFeesAmount} {selectedFeeToken}
+
+ {gasFeesAmountUSD} USD
+ >
)}
- USDValue={amountUsdPrice}
- size="medium"
- centered
+
+
+ {!estimatingGas && (
+
+ {translate('maximumFees')} {gasFeesAmount} {selectedFeeToken}
+
+ )}
+ {gasFees.includeDeploy && (
+
+ *{translate('feesIncludeOneTimeDeploymentFee')}
+
+ )}
+
+
+
+ {translate('total')}
+
+
+
+ {totalAmountDisplay()}
+ {totalAmountUSD} USD
+
+
+ {totalAmount && (
+
+ {translate('maximumAmount')} {totalAmount} {selectedFeeToken}
+
+ )}
+ {totalExceedsBalance && (
+
-
-
-
- {translate('gasFeesDefinition')}
-
-
-
- }
- >
- {translate('estimatedFee')}
-
-
-
- {estimatingGas && }
- {!estimatingGas && (
- <>
-
- {gasFeesAmount} {selectedFeeToken}
-
- {gasFeesAmountUSD} USD
- >
- )}
-
-
- {!estimatingGas && (
-
- {translate('maximumFees')} {gasFeesAmount} {selectedFeeToken}
-
- )}
- {gasFees.includeDeploy && (
-
- *{translate('feesIncludeOneTimeDeploymentFee')}
-
- )}
-
-
-
- {translate('total')}
-
-
-
- {totalAmountDisplay()}
- {totalAmountUSD} USD
-
-
- {totalAmount && (
-
- {translate('maximumAmount')} {totalAmount} {selectedFeeToken}
-
- )}
- {totalExceedsBalance && (
-
- )}
-
-
-
- {translate('reject')}
-
-
- {translate('confirm')}
-
-
-
- )
+ )}
+
+
+
+ {translate('reject')}
+
+
+ {translate('confirm')}
+
+
+
);
};
diff --git a/packages/wallet-ui/src/components/ui/organism/Menu/Menu.view.tsx b/packages/wallet-ui/src/components/ui/organism/Menu/Menu.view.tsx
index 650f73bb..2e870ae4 100644
--- a/packages/wallet-ui/src/components/ui/organism/Menu/Menu.view.tsx
+++ b/packages/wallet-ui/src/components/ui/organism/Menu/Menu.view.tsx
@@ -58,183 +58,179 @@ export const MenuView = ({ connected, ...otherProps }: IProps) => {
}
return (
- translate && (
-
-
-
-
-
-
);
};
diff --git a/packages/wallet-ui/src/components/ui/organism/MinVersionModal/MinVersionModal.view.tsx b/packages/wallet-ui/src/components/ui/organism/MinVersionModal/MinVersionModal.view.tsx
index 9985aae3..68118540 100644
--- a/packages/wallet-ui/src/components/ui/organism/MinVersionModal/MinVersionModal.view.tsx
+++ b/packages/wallet-ui/src/components/ui/organism/MinVersionModal/MinVersionModal.view.tsx
@@ -15,41 +15,36 @@ export const MinVersionModalView = () => {
const { translate } = useMultiLanguage();
return (
- translate && (
-
-
- {metaMaskUpgradeRequired ? (
- <>
- {translate('metaMaskUpgradeNeeded')}
-
-
- {translate('updateMetaMaskVersion', MIN_METAMASK_VERSION)}
-
-
-
- }
- onClick={() => {}}
- >
- {translate('goToMetaMaskWebsite')}
-
-
- >
- ) : (
- <>
- {translate('newVersionAvailable')}
-
- {translate('installLatestVersion')}
-
- - {translate('deleteCurrentVersionMetaMask')}
- - {translate('refreshPage')}
- - {translate('connectToMetaMask')}
-
- {translate('accountRecoveryInfo')}
-
- >
- )}
-
- )
+
+
+ {metaMaskUpgradeRequired ? (
+ <>
+ {translate('metaMaskUpgradeNeeded')}
+
+
+ {translate('updateMetaMaskVersion', MIN_METAMASK_VERSION)}
+
+
+
+ } onClick={() => {}}>
+ {translate('goToMetaMaskWebsite')}
+
+
+ >
+ ) : (
+ <>
+ {translate('newVersionAvailable')}
+
+ {translate('installLatestVersion')}
+
+ - {translate('deleteCurrentVersionMetaMask')}
+ - {translate('refreshPage')}
+ - {translate('connectToMetaMask')}
+
+ {translate('accountRecoveryInfo')}
+
+ >
+ )}
+
);
};
diff --git a/packages/wallet-ui/src/components/ui/organism/NoFlaskModal/NoFlaskModal.view.tsx b/packages/wallet-ui/src/components/ui/organism/NoFlaskModal/NoFlaskModal.view.tsx
index 69a6bf47..e1bc7a83 100644
--- a/packages/wallet-ui/src/components/ui/organism/NoFlaskModal/NoFlaskModal.view.tsx
+++ b/packages/wallet-ui/src/components/ui/organism/NoFlaskModal/NoFlaskModal.view.tsx
@@ -13,29 +13,27 @@ export const NoFlaskModalView = () => {
const { translate } = useMultiLanguage();
return (
- translate && (
-
-
- {translate('metaMaskFlaskExtensionRequired')}
-
- {translate('installMetaMaskFlaskToUseSnap')}
-
-
-
-
-
- } onClick={() => {}}>
- {translate('downloadMetaMaskFlask')}
-
-
-
- )
+
+
+ {translate('metaMaskFlaskExtensionRequired')}
+
+ {translate('installMetaMaskFlaskToUseSnap')}
+
+
+
+
+
+ } onClick={() => {}}>
+ {translate('downloadMetaMaskFlask')}
+
+
+
);
};
diff --git a/packages/wallet-ui/src/components/ui/organism/NoMetamaskModal/NoMetamaskModal.view.tsx b/packages/wallet-ui/src/components/ui/organism/NoMetamaskModal/NoMetamaskModal.view.tsx
index a5ba2eff..554ba94b 100644
--- a/packages/wallet-ui/src/components/ui/organism/NoMetamaskModal/NoMetamaskModal.view.tsx
+++ b/packages/wallet-ui/src/components/ui/organism/NoMetamaskModal/NoMetamaskModal.view.tsx
@@ -12,25 +12,19 @@ export const NoMetamaskModalView = () => {
const { translate } = useMultiLanguage();
return (
- translate && (
-
-
- {translate('metaMaskExtensionRequired')}
-
- {translate('installMetaMaskToUseSnap')}
-
-
-
-
- } onClick={() => {}}>
- {translate('downloadMetaMask')}
-
-
-
- )
+
+
+ {translate('metaMaskExtensionRequired')}
+
+ {translate('installMetaMaskToUseSnap')}
+
+
+
+
+ } onClick={() => {}}>
+ {translate('downloadMetaMask')}
+
+
+
);
};
diff --git a/packages/wallet-ui/src/components/ui/organism/SideBar/SideBar.view.tsx b/packages/wallet-ui/src/components/ui/organism/SideBar/SideBar.view.tsx
index 37b0e8cf..4cd3ffe4 100644
--- a/packages/wallet-ui/src/components/ui/organism/SideBar/SideBar.view.tsx
+++ b/packages/wallet-ui/src/components/ui/organism/SideBar/SideBar.view.tsx
@@ -68,74 +68,72 @@ export const SideBarView = ({ address }: Props) => {
}, [address, chainId]);
return (
- translate && (
-
-
-
-
-
- setInfoModalOpen(false)}
- address={address}
- />
-
-
- setAccountDetailsOpen(true)}
- >
- {translate('accountDetails')}
-
- openExplorerTab(address, 'contract', chainId)}
- >
- {translate('viewOnExplorer')}
-
-
- }
- >
-
-
+
+
+
+
+
+ setInfoModalOpen(false)}
+ address={address}
+ />
+
+
+ setAccountDetailsOpen(true)}
+ >
+ {translate('accountDetails')}
+
+ openExplorerTab(address, 'contract', chainId)}
+ >
+ {translate('viewOnExplorer')}
+
+
+ }
+ >
+
+
- {translate('myAccount')}
-
- setInfoModalOpen(true)}>i
-
-
-
-
-
-
-
-
- }
- backgroundTransparent
- shadowVisible={listOverflow}
- onClick={() => setAddTokenOpen(true)}
- >
- {translate('addToken').toUpperCase()}
-
-
- setAddTokenOpen(false)} />
-
-
- )
+ {translate('myAccount')}
+
+ setInfoModalOpen(true)}>i
+
+
+
+
+
+
+
+
+ }
+ backgroundTransparent
+ shadowVisible={listOverflow}
+ onClick={() => setAddTokenOpen(true)}
+ >
+ {translate('addToken').toUpperCase()}
+
+
+ setAddTokenOpen(false)} />
+
+
);
};
diff --git a/packages/wallet-ui/src/components/ui/organism/UpgradeModel/UpgradeModel.view.tsx b/packages/wallet-ui/src/components/ui/organism/UpgradeModel/UpgradeModel.view.tsx
index 58926df1..9e6d111e 100644
--- a/packages/wallet-ui/src/components/ui/organism/UpgradeModel/UpgradeModel.view.tsx
+++ b/packages/wallet-ui/src/components/ui/organism/UpgradeModel/UpgradeModel.view.tsx
@@ -82,65 +82,55 @@ export const UpgradeModelView = ({ address }: Props) => {
switch (stage) {
case Stage.INIT:
return (
- translate && (
- <>
-
- {translate('newVersionOfSmartContractNecessaryPart1')}
-
- {translate('newVersionOfSmartContractNecessaryPart2')}
-
- {translate('newVersionOfSmartContractNecessaryPart3')}
- {translate('newVersionOfSmartContractNecessaryPart4')}
-
-
- {translate('upgrade')}
-
- >
- )
+ <>
+
+ {translate('newVersionOfSmartContractNecessaryPart1')}
+
+ {translate('newVersionOfSmartContractNecessaryPart2')}
+
+ {translate('newVersionOfSmartContractNecessaryPart3')}
+ {translate('newVersionOfSmartContractNecessaryPart4')}
+
+
+ {translate('upgrade')}
+
+ >
);
case Stage.WAITING_FOR_TXN:
return (
- translate && (
-
- {translate('waitingForTransaction')}
-
- )
+
+ {translate('waitingForTransaction')}
+
);
case Stage.SUCCESS:
return (
- translate && (
-
- {translate('accountUpgradedSuccessfully')}
-
- )
+
+ {translate('accountUpgradedSuccessfully')}
+
);
default:
return (
- translate && (
-
- {translate('transactionHash')}
{' '}
- openExplorerTab(txnHash, 'tx', chainId)}>
- {shortenAddress(txnHash)}{' '}
-
-
- {translate('upgradeTransactionPendingPart1')}
-
- {translate('upgradeTransactionPendingPart2')}
-
- {translate('upgradeTransactionPendingPart3')}
-
- )
+
+ {translate('transactionHash')}
{' '}
+ openExplorerTab(txnHash, 'tx', chainId)}>
+ {shortenAddress(txnHash)}{' '}
+
+
+ {translate('upgradeTransactionPendingPart1')}
+
+ {translate('upgradeTransactionPendingPart2')}
+
+ {translate('upgradeTransactionPendingPart3')}
+
);
}
};
return (
- translate && (
-
-
- {translate('upgradeAccount')}
- {renderComponent()}
-
- )
+
+
+ {translate('upgradeAccount')}
+ {renderComponent()}
+
);
};