From 4d30ae9cc9d16f624fa9c46a7153c3ead8358ee7 Mon Sep 17 00:00:00 2001
From: Shorn <shorn.keld@gnosis.io>
Date: Tue, 14 May 2024 16:29:50 +0200
Subject: [PATCH 1/4] remove marketplace link in menu

---
 src/components/Navigation.js         | 6 ------
 src/components/NavigationFloating.js | 9 +--------
 src/utils/constants.js               | 1 -
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/components/Navigation.js b/src/components/Navigation.js
index fe988434..78cb0871 100644
--- a/src/components/Navigation.js
+++ b/src/components/Navigation.js
@@ -30,7 +30,6 @@ import {
   ABOUT_URL,
   BUG_REPORTING_URL,
   FAQ_URL,
-  MARKETPLACE_URL,
   PRIVACY_LEGAL_URL,
 } from '~/utils/constants';
 
@@ -167,11 +166,6 @@ const NavigationFooter = () => {
             {translate('Navigation.linkBugReporting')}
           </NavigationExternalLink>
         </Grid>
-        <Grid item xs={6}>
-          <NavigationExternalLink href={MARKETPLACE_URL}>
-            {translate('Navigation.linkMarketplace')}
-          </NavigationExternalLink>
-        </Grid>
         <Grid item xs={6}>
           <NavigationExternalLink href={ABOUT_URL}>
             {translate('Navigation.linkAbout')}
diff --git a/src/components/NavigationFloating.js b/src/components/NavigationFloating.js
index 24046663..9361007f 100644
--- a/src/components/NavigationFloating.js
+++ b/src/components/NavigationFloating.js
@@ -15,7 +15,7 @@ import ExternalLink from '~/components/ExternalLink';
 import translate from '~/services/locale';
 import { IconWobblyCircleSecond } from '~/styles/icons';
 import { IconClose, IconMore } from '~/styles/icons';
-import { BUG_REPORTING_URL, MARKETPLACE_URL } from '~/utils/constants';
+import { BUG_REPORTING_URL } from '~/utils/constants';
 
 const useStyles = makeStyles((theme) => {
   const backgroundTheme = (props) => {
@@ -210,13 +210,6 @@ export default function NavigationFloating(props) {
             </Button>
           </Link>
         </MenuItem>
-        <ExternalLink href={MARKETPLACE_URL}>
-          <MenuItem onClick={handleClose}>
-            <Button isOutline>
-              {translate('NavigationFloating.linkMarketplace')}
-            </Button>
-          </MenuItem>
-        </ExternalLink>
         <ExternalLink href={BUG_REPORTING_URL}>
           <MenuItem onClick={handleClose}>
             <Button isOutline>
diff --git a/src/utils/constants.js b/src/utils/constants.js
index bdbd2c11..e57e44fe 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -14,7 +14,6 @@ export const FAQ_URL_DELETION =
   'https://joincircles.net/faq/profile-data-deletion/';
 export const FAQ_TRANSITIVE_TRANSFERS_URL =
   'https://joincircles.net/faq/who-can-accept-circles-tokens-crc-as-a-payment/';
-export const MARKETPLACE_URL = 'http://market.joincircles.net';
 export const PRIVACY_LEGAL_URL = 'https://joincircles.net/privacy-policy';
 export const TELEGRAM_URL = 'https://t.me/CirclesUBI';
 export const TERMS_URL = 'https://joincircles.net/terms';

From c7e00df9402d4e8748dd69a2800c95b75a62e9cd Mon Sep 17 00:00:00 2001
From: Shorn <shorn.keld@gnosis.io>
Date: Tue, 14 May 2024 17:27:00 +0200
Subject: [PATCH 2/4] update more links where possible

---
 src/utils/constants.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/utils/constants.js b/src/utils/constants.js
index e57e44fe..0615ec28 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -4,20 +4,20 @@ export const ISSUANCE_RATE_MONTH = process.env.ISSUANCE_RATE_MONTH || 720; // Ti
 export const PATHFINDER_HOPS_DEFAULT = 3;
 export const NEEDED_TRUST_CONNECTIONS = 1;
 
-export const ABOUT_URL = 'https://joincircles.net';
+export const ABOUT_URL = 'https://www.aboutcircles.com';
 export const BUG_REPORTING_URL =
-  'https://docs.google.com/forms/d/e/1FAIpQLSdczjck3RFE5VN5oSuge6aQWVAY7WA5RyIRYyFusj1kCSz0SQ/viewform';
-export const EMAIL_URL = 'mailto:hello@joincircles.net';
+  'mailto:support@aboutcircles.com';
+export const EMAIL_URL = 'mailto:hello@aboutcircles.com';
 export const FACEBOOK_URL = 'https://facebook.com/CirclesUBI';
-export const FAQ_URL = 'https://joincircles.net/faq';
+export const FAQ_URL = 'https://www.aboutcircles.com/faq';
 export const FAQ_URL_DELETION =
   'https://joincircles.net/faq/profile-data-deletion/';
 export const FAQ_TRANSITIVE_TRANSFERS_URL =
-  'https://joincircles.net/faq/who-can-accept-circles-tokens-crc-as-a-payment/';
+  'https://github.com/CirclesUBI/whitepaper?tab=readme-ov-file#transitive-exchange';
 export const PRIVACY_LEGAL_URL = 'https://joincircles.net/privacy-policy';
-export const TELEGRAM_URL = 'https://t.me/CirclesUBI';
+export const TELEGRAM_URL = 'https://t.me/about_circles';
 export const TERMS_URL = 'https://joincircles.net/terms';
-export const TWITTER_URL = 'https://twitter.com/CirclesUBI';
+export const TWITTER_URL = 'https://twitter.com/aboutcircles';
 
 export const SAFE_LAST_VERSION = '1.3.0';
 export const SAFE_CRC_VERSION = '1.1.1';

From 72a3c79030b1841e1d553a5a6f7c65d7a065f71b Mon Sep 17 00:00:00 2001
From: Shorn <shorn.keld@gnosis.io>
Date: Wed, 15 May 2024 16:45:14 +0200
Subject: [PATCH 3/4] fix line breaks and whitespace issue

---
 src/utils/constants.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/utils/constants.js b/src/utils/constants.js
index 0615ec28..3a39f602 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -5,13 +5,11 @@ export const PATHFINDER_HOPS_DEFAULT = 3;
 export const NEEDED_TRUST_CONNECTIONS = 1;
 
 export const ABOUT_URL = 'https://www.aboutcircles.com';
-export const BUG_REPORTING_URL =
-  'mailto:support@aboutcircles.com';
+export const BUG_REPORTING_URL = 'mailto:support@aboutcircles.com';
 export const EMAIL_URL = 'mailto:hello@aboutcircles.com';
 export const FACEBOOK_URL = 'https://facebook.com/CirclesUBI';
 export const FAQ_URL = 'https://www.aboutcircles.com/faq';
-export const FAQ_URL_DELETION =
-  'https://joincircles.net/faq/profile-data-deletion/';
+export const FAQ_URL_DELETION = 'https://joincircles.net/faq/profile-data-deletion/';
 export const FAQ_TRANSITIVE_TRANSFERS_URL =
   'https://github.com/CirclesUBI/whitepaper?tab=readme-ov-file#transitive-exchange';
 export const PRIVACY_LEGAL_URL = 'https://joincircles.net/privacy-policy';
@@ -24,4 +22,4 @@ export const SAFE_CRC_VERSION = '1.1.1';
 
 export const FILTER_TRANSACTION_ALL = 'FILTER_TRANSACTION_ALL';
 export const FILTER_TRANSACTION_SENT = 'FILTER_TRANSACTION_SENT';
-export const FILTER_TRANSACTION_RECEIVED = 'FILTER_TRANSACTION_RECEIVED';
+export const FILTER_TRANSACTION_RECEIVED = 'FILTER_TRANSACTION_RECEIVED';
\ No newline at end of file

From 4701b0e4768aba48aab6bf9c870c0e359059df7b Mon Sep 17 00:00:00 2001
From: Shorn <shorn.keld@gnosis.io>
Date: Wed, 15 May 2024 17:00:55 +0200
Subject: [PATCH 4/4] actually fix the linebreak issue

- fix linebreaks and whitespace issues not fixed by last commit!
---
 src/utils/constants.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/utils/constants.js b/src/utils/constants.js
index 3a39f602..f92d65fb 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -9,7 +9,8 @@ export const BUG_REPORTING_URL = 'mailto:support@aboutcircles.com';
 export const EMAIL_URL = 'mailto:hello@aboutcircles.com';
 export const FACEBOOK_URL = 'https://facebook.com/CirclesUBI';
 export const FAQ_URL = 'https://www.aboutcircles.com/faq';
-export const FAQ_URL_DELETION = 'https://joincircles.net/faq/profile-data-deletion/';
+export const FAQ_URL_DELETION =
+  'https://joincircles.net/faq/profile-data-deletion/';
 export const FAQ_TRANSITIVE_TRANSFERS_URL =
   'https://github.com/CirclesUBI/whitepaper?tab=readme-ov-file#transitive-exchange';
 export const PRIVACY_LEGAL_URL = 'https://joincircles.net/privacy-policy';
@@ -22,4 +23,4 @@ export const SAFE_CRC_VERSION = '1.1.1';
 
 export const FILTER_TRANSACTION_ALL = 'FILTER_TRANSACTION_ALL';
 export const FILTER_TRANSACTION_SENT = 'FILTER_TRANSACTION_SENT';
-export const FILTER_TRANSACTION_RECEIVED = 'FILTER_TRANSACTION_RECEIVED';
\ No newline at end of file
+export const FILTER_TRANSACTION_RECEIVED = 'FILTER_TRANSACTION_RECEIVED';