Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/remove-marketplace-…
Browse files Browse the repository at this point in the history
…link' into style-update
  • Loading branch information
jaensen committed May 15, 2024
2 parents 4b83c9a + 4701b0e commit 02be4ee
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 17 deletions.
9 changes: 1 addition & 8 deletions src/components/NavigationFloating.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down Expand Up @@ -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>
Expand Down
16 changes: 7 additions & 9 deletions src/utils/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,19 @@ 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 BUG_REPORTING_URL =
'https://docs.google.com/forms/d/e/1FAIpQLSdczjck3RFE5VN5oSuge6aQWVAY7WA5RyIRYyFusj1kCSz0SQ/viewform';
export const EMAIL_URL = 'mailto:hello@joincircles.net';
export const ABOUT_URL = 'https://www.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://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/';
export const MARKETPLACE_URL = 'http://market.joincircles.net';
'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';
Expand Down

0 comments on commit 02be4ee

Please sign in to comment.