From 2e92e4a54b44b3ca3c539c1e13cebcfdad3e588a Mon Sep 17 00:00:00 2001
From: z0ccc <z0ccc@proton.me>
Date: Thu, 9 Feb 2023 17:56:26 -0500
Subject: [PATCH] removed vpn page and updated urls

---
 package.json                           |  2 +-
 src/background/index.ts                |  2 +-
 src/manifest.json                      |  2 +-
 src/popup/Popup.tsx                    |  6 +++---
 src/popup/pages/locationPage/index.tsx | 10 +++++-----
 src/popup/pages/settingsPage/index.tsx | 14 +++++---------
 src/popup/pages/vpnPage/index.tsx      | 20 +++++++++++++-------
 7 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index 1598b93..0e72a8a 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vytal",
-  "version": "2.1.9",
+  "version": "10",
   "description": "Spoof your location data and user agent.",
   "license": "MIT",
   "repository": {
diff --git a/src/background/index.ts b/src/background/index.ts
index 4b28fa2..08df073 100644
--- a/src/background/index.ts
+++ b/src/background/index.ts
@@ -21,4 +21,4 @@ chrome.tabs.onUpdated.addListener((tabId) => {
   attachTab(tabId)
 })
 
-chrome.runtime.setUninstallURL('https://vytal.io/#/vpns')
\ No newline at end of file
+chrome.runtime.setUninstallURL('https://vytal.io/scan')
diff --git a/src/manifest.json b/src/manifest.json
index 9b69ccf..62d7350 100755
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,6 +1,6 @@
 {
   "manifest_version": 3,
-  "version": "2.1.9",
+  "version": "2.1.10",
   "name": "__MSG_extName__",
   "description": "__MSG_extDesc__",
   "author": "__MSG_extName__",
diff --git a/src/popup/Popup.tsx b/src/popup/Popup.tsx
index 91606ea..649f78a 100644
--- a/src/popup/Popup.tsx
+++ b/src/popup/Popup.tsx
@@ -58,11 +58,11 @@ const Popup = () => {
             active={tab === 'userAgent'}
             onClick={() => setTab('userAgent')}
           />
-          <TabItem
+          {/* <TabItem
             Icon={<img src={VpnIcon} className="App-logo" alt="logo" />}
             active={tab === 'vpn'}
             onClick={() => setTab('vpn')}
-          />
+          /> */}
           {/* <TabItem
             Icon={<Sliders size={20} />}
             active={tab === 'settings'}
@@ -77,7 +77,7 @@ const Popup = () => {
         <Box sx={{ m: '16px', width: '100%' }}>
           <LocationPage tab={tab} setTab={setTab} />
           <UserAgentPage tab={tab} />
-          <VpnPage tab={tab} />
+          {/* <VpnPage tab={tab} /> */}
           <SettingsPage tab={tab} setTab={setTab} />
         </Box>
       </Flex>
diff --git a/src/popup/pages/locationPage/index.tsx b/src/popup/pages/locationPage/index.tsx
index dd2de5b..92c2640 100644
--- a/src/popup/pages/locationPage/index.tsx
+++ b/src/popup/pages/locationPage/index.tsx
@@ -9,7 +9,7 @@ import configurations from 'utils/configurations'
 import getIp from 'utils/getIp'
 import { ipData } from 'types'
 import { RotateCw } from 'react-feather'
-import { polyfillCountryFlagEmojis } from "country-flag-emoji-polyfill";
+import { polyfillCountryFlagEmojis } from 'country-flag-emoji-polyfill'
 
 interface LocationPageProps {
   tab: string
@@ -26,7 +26,7 @@ const LocationPage = ({ tab, setTab }: LocationPageProps) => {
   const [lon, setLongitude] = useState('')
   const [configuration, setConfiguration] = useState('custom')
 
-  polyfillCountryFlagEmojis();
+  polyfillCountryFlagEmojis()
 
   const reloadIp = useCallback(() => {
     setIpInfo('loading...')
@@ -257,11 +257,11 @@ const LocationPage = ({ tab, setTab }: LocationPageProps) => {
         }}
       >
         Vytal does not change your IP address. To change your IP address you
-        will need a{' '}
-        <Button variant="text" onClick={() => setTab('vpn')}>
+        will need a VPN or proxy.
+        {/* <Button variant="text" onClick={() => setTab('vpn')}>
           VPN or proxy
         </Button>
-        .
+        . */}
       </Box>
     </Page>
   )
diff --git a/src/popup/pages/settingsPage/index.tsx b/src/popup/pages/settingsPage/index.tsx
index 9fe991b..d71be28 100644
--- a/src/popup/pages/settingsPage/index.tsx
+++ b/src/popup/pages/settingsPage/index.tsx
@@ -28,11 +28,11 @@ const SettingsPage = ({ tab, setTab }: SettingsPageProps) => {
       </InfoItem>
       <InfoItem title={'Change IP Address'}>
         Vytal does not change your IP address. To change your IP address you
-        will need a{' '}
-        <Button variant="text" onClick={() => setTab('vpn')}>
+        will need a VPN or proxy.
+        {/* <Button variant="text" onClick={() => setTab('vpn')}>
           VPN or proxy
         </Button>
-        .
+        . */}
       </InfoItem>
       {/* <InfoItem title={'Vytal vs Similar Extensions'}>
         Vytal utilizes the debugger API to spoof data which is completely
@@ -48,7 +48,7 @@ const SettingsPage = ({ tab, setTab }: SettingsPageProps) => {
       </InfoItem> */}
       <InfoItem title={'Test Extension'}>
         You can test and compare Vytal and other spoofing extensions on{' '}
-        <Link variant="hover" href={`https://vytal.io/#/scan`} target="_blank">
+        <Link variant="hover" href={`https://vytal.io/scan`} target="_blank">
           vytal.io
         </Link>
         .
@@ -63,11 +63,7 @@ const SettingsPage = ({ tab, setTab }: SettingsPageProps) => {
           rate the extension
         </Link>{' '}
         or{' '}
-        <Link
-          variant="hover"
-          href={`https://vytal.io/#/donate`}
-          target="_blank"
-        >
+        <Link variant="hover" href={`https://vytal.io/donate`} target="_blank">
           donate
         </Link>
         .
diff --git a/src/popup/pages/vpnPage/index.tsx b/src/popup/pages/vpnPage/index.tsx
index 49ac157..52a97c5 100644
--- a/src/popup/pages/vpnPage/index.tsx
+++ b/src/popup/pages/vpnPage/index.tsx
@@ -1,8 +1,8 @@
-import { Box, Image } from 'theme-ui'
+import { Box } from 'theme-ui'
 import Page from 'popup/components/Page'
 import VpnItem from './VpnItem'
-import nordLogo from 'assets/nord.svg'
-import protonLogo from 'assets/surfShark.svg'
+// import nordLogo from 'assets/nord.svg'
+// import surfSharkLogo from 'assets/surfShark.svg'
 
 interface VpnPageProps {
   tab: string
@@ -11,14 +11,20 @@ interface VpnPageProps {
 const VpnPage = ({ tab }: VpnPageProps) => {
   return (
     <Page isCurrentTab={tab === 'vpn'} title={'VPN Recommendations'}>
-      <VpnItem url="https://go.nordvpn.net/aff_c?offer_id=658&aff_id=79520&source=v" linkText="Click for 63% off discount">
-        <Image src={nordLogo} alt="NordVPN logo" variant="vpnLogo" />
+      <VpnItem
+        url="https://go.nordvpn.net/aff_c?offer_id=658&aff_id=79520&source=v"
+        linkText="Click for 63% off discount"
+      >
+        {/* <Image src={nordLogo} alt="NordVPN logo" variant="vpnLogo" /> */}
         <li>Verified zero-logs policy & no IP leaks</li>
         <li>5,600+ servers in 59 countries</li>
         <li>24/7 live chat support</li>
       </VpnItem>
-      <VpnItem url="https://get.surfshark.net/aff_c?offer_id=926&aff_id=17240&source=v" linkText="Click for 82% off + 2 mo. FREE">
-        <Image src={protonLogo} alt="Surf Shark logo" variant="vpnLogo" />
+      <VpnItem
+        url="https://get.surfshark.net/aff_c?offer_id=926&aff_id=17240&source=v"
+        linkText="Click for 82% off + 2 mo. FREE"
+      >
+        {/* <Image src={surfSharkLogo} alt="Surf Shark logo" variant="vpnLogo" /> */}
         <Box>
           <li>Verified zero-logs policy & no IP leaks</li>
           <li>3200+ servers in 100 countries</li>