resolved merge conflict and fixed few styling issues

QuickSwap · Jul 22, 2023 · e84f57e · e84f57e
1 parent 4c5d0df
commit e84f57e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/public/locales/en.json b/public/locales/en.json
@@ -694,5 +694,6 @@
   "docs": "Docs",
   "governance": "Governance",
   "proposals": "Proposals",
-  "termsofuse": "Terms of Use"
+  "termsofuse": "Terms of Use",
+  "walletDescription": "Connecting your wallet is like \"logging in\" on Web3. Select your wallet from the options to get started."
 }
diff --git a/src/components/WalletModal/WalletModal.tsx b/src/components/WalletModal/WalletModal.tsx
@@ -368,11 +368,10 @@ const WalletModal: React.FC<WalletModalProps> = ({
             <h6>{t('connectWallet')}</h6>
             <Close className='cursor-pointer' onClick={toggleWalletModal} />
           </Box>
-          <Box my={1} sx={{ color: '#696c80' }}>
-            Connecting your wallet is like &quot;logging in&quot; on Web3.
-            Select your wallet from the options to get started.
+          <Box my={1} className='walletDescriptionContainer'>
+            {t('walletDescription')}
           </Box>
-          <Box className='abc'>
+          <Box>
             {walletView === WALLET_VIEWS.PENDING ? (
               <PendingView
                 connection={pendingWallet}
@@ -395,7 +394,7 @@ const WalletModal: React.FC<WalletModalProps> = ({
           <Box paddingY={2.5} className={iconify ? 'blurb-iconify' : 'blurb'}>
             <small>{t('newToMatic')}</small>
             <a
-              href='https://docs.matic.network/docs/develop/wallets/getting-started'
+              href='https://wiki.polygon.technology/docs/tools/wallets/getting-started'
               target='_blank'
               rel='noopener noreferrer'
             >

diff --git a/src/components/styles/WalletModal.scss b/src/components/styles/WalletModal.scss
@@ -16,6 +16,10 @@
   }
 }
 
+.walletDescriptionContainer {
+  color: $textSecondary;
+}
+
 .option-container {
   display: flex;
   flex-direction: column;