aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Makazzz <makazzzpro@live.ca>2019-09-29 11:37:10 -0400
committerLibravatar Makazzz <makazzzpro@live.ca>2019-09-29 11:37:10 -0400
commit0be8eb218e3af03f37238c05257e7408a53c1af3 (patch)
tree3a52381071ff6a3738ece13399180e42274e02f8
parentReplace leftover Franz references (diff)
downloadferdium-app-0be8eb218e3af03f37238c05257e7408a53c1af3.tar.gz
ferdium-app-0be8eb218e3af03f37238c05257e7408a53c1af3.tar.zst
ferdium-app-0be8eb218e3af03f37238c05257e7408a53c1af3.zip
Add dynamic change for TOS and Privacy
-rw-r--r--src/components/auth/Signup.js3
-rw-r--r--src/lib/Menu.js8
2 files changed, 7 insertions, 4 deletions
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index b36e71ce1..10b124690 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -119,6 +119,9 @@ export default @observer class Signup extends Component {
119 119
120 const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' ? window.ferdi.stores.settings.all.app.server : 'https://meetfranz.com'; 120 const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' ? window.ferdi.stores.settings.all.app.server : 'https://meetfranz.com';
121 121
122 //This is the change for the issue #80, need testing
123 const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://server.getferdi.com' ? window.ferdi.stores.settings.all.app.server : 'https://getferdi.com';
124
122 return ( 125 return (
123 <div className="auth__scroll-container"> 126 <div className="auth__scroll-container">
124 <div className="auth__container auth__container--signup"> 127 <div className="auth__container auth__container--signup">
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index e8cd550e4..65e0326da 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -463,11 +463,11 @@ const _templateFactory = intl => [
463 }, 463 },
464 { 464 {
465 label: intl.formatMessage(menuItems.tos), 465 label: intl.formatMessage(menuItems.tos),
466 click() { shell.openExternal('https://getferdi.com/terms'); }, 466 click() { shell.openExternal('https://meetfranz.com/terms'); },
467 }, 467 },
468 { 468 {
469 label: intl.formatMessage(menuItems.privacy), 469 label: intl.formatMessage(menuItems.privacy),
470 click() { shell.openExternal('https://getferdi.com/privacy'); }, 470 click() { shell.openExternal('https://meetfranz.com/privacy'); },
471 }, 471 },
472 ], 472 ],
473 }, 473 },
@@ -655,11 +655,11 @@ const _titleBarTemplateFactory = intl => [
655 }, 655 },
656 { 656 {
657 label: intl.formatMessage(menuItems.tos), 657 label: intl.formatMessage(menuItems.tos),
658 click() { shell.openExternal('https://getferdi.com/terms'); }, 658 click() { shell.openExternal('https://meetfranz.com/terms'); },
659 }, 659 },
660 { 660 {
661 label: intl.formatMessage(menuItems.privacy), 661 label: intl.formatMessage(menuItems.privacy),
662 click() { shell.openExternal('https://getferdi.com/privacy'); }, 662 click() { shell.openExternal('https://meetfranz.com/privacy'); },
663 }, 663 },
664 ], 664 ],
665 }, 665 },