diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 597b3e2b0a73..940a80c07318 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -1707,8 +1707,6 @@ pref("image.mem.max_decoded_image_kb", 256000); pref("loop.enabled", true); pref("loop.textChat.enabled", true); pref("loop.server", "https://loop.services.mozilla.com/v0"); -pref("loop.seenToS", "unseen"); -pref("loop.showPartnerLogo", true); pref("loop.gettingStarted.seen", false); pref("loop.gettingStarted.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/hello/start/"); pref("loop.gettingStarted.resumeOnFirstJoin", false); diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 673c5d8d456b..86f7e096aa07 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -563,8 +563,20 @@ + - {mozL10n.get("powered_by_beforeLogo")} - - {mozL10n.get("powered_by_afterLogo")} -

- ); - }, - render: function() { - if (!this.state.gettingStartedSeen || this.state.seenToS == "unseen") { - var terms_of_use_url = navigator.mozLoop.getLoopPref("legal.ToS_url"); - var privacy_notice_url = navigator.mozLoop.getLoopPref("legal.privacy_url"); - var tosHTML = mozL10n.get("legal_text_and_links3", { - "clientShortname": mozL10n.get("clientShortname2"), - "terms_of_use": React.renderToStaticMarkup( - - {mozL10n.get("legal_text_tos")} - - ), - "privacy_notice": React.renderToStaticMarkup( - - {mozL10n.get("legal_text_privacy")} - - ) - }); - return ( -
- {this.renderPartnerLogo()} -

-
- ); - } else { - return
; - } + var locale = mozL10n.getLanguage(); + var terms_of_use_url = navigator.mozLoop.getLoopPref("legal.ToS_url"); + var privacy_notice_url = navigator.mozLoop.getLoopPref("legal.privacy_url"); + var tosHTML = mozL10n.get("legal_text_and_links3", { + "clientShortname": mozL10n.get("clientShortname2"), + "terms_of_use": React.renderToStaticMarkup( + + {mozL10n.get("legal_text_tos")} + + ), + "privacy_notice": React.renderToStaticMarkup( + + {mozL10n.get("legal_text_privacy")} + + ) + }); + return ( +
+

+ {mozL10n.get("powered_by_beforeLogo")} + + {mozL10n.get("powered_by_afterLogo")} +

+

+
+ ); } }); @@ -970,7 +945,6 @@ loop.panel = (function(_, mozL10n) { mozLoop={this.props.mozLoop} store={this.props.roomStore} userProfile={this.state.userProfile} /> - { @@ -25,9 +23,6 @@ add_test(function test_openChatWindow_on_notification() { waitForCondition(() => opened).then(() => { do_check_true(opened, "should open a chat window"); - do_check_eq(Services.prefs.getCharPref("loop.seenToS"), "seen", - "should set the pref to 'seen'"); - run_next_test(); }, () => { do_throw("should have opened a chat window"); @@ -56,9 +51,6 @@ function run_test() { do_register_cleanup(function() { // Revert original Chat.open implementation Chat.open = openChatOrig; - - // clear test pref - Services.prefs.clearUserPref("loop.seenToS"); }); run_next_test(); diff --git a/browser/components/preferences/in-content/sync.js b/browser/components/preferences/in-content/sync.js index c4b4993f5c8d..c4a8e4da073d 100644 --- a/browser/components/preferences/in-content/sync.js +++ b/browser/components/preferences/in-content/sync.js @@ -240,18 +240,14 @@ let gSyncPane = { gSyncPane.startOver(true); return false; }); - setEventListener("noFxaSignUp", "click", function () { + setEventListener("noFxaSignUp", "command", function () { gSyncPane.signUp(); return false; }); - setEventListener("noFxaSignIn", "click", function () { + setEventListener("noFxaSignIn", "command", function () { gSyncPane.signIn(); return false; }); - setEventListener("noFxaUseOldSync", "click", function () { - gSyncPane.openOldSyncSupportPage(); - return false; - }); setEventListener("verifiedManage", "command", gSyncPane.manageFirefoxAccount); setEventListener("fxaUnlinkButton", "click", function () { @@ -259,13 +255,13 @@ let gSyncPane = { }); setEventListener("verifyFxaAccount", "command", gSyncPane.verifyFirefoxAccount); - setEventListener("unverifiedUnlinkFxaAccount", "click", function () { + setEventListener("unverifiedUnlinkFxaAccount", "command", function () { /* no warning as account can't have previously synced */ gSyncPane.unlinkFirefoxAccount(false); }); setEventListener("rejectReSignIn", "command", gSyncPane.reSignIn); - setEventListener("rejectUnlinkFxaAccount", "click", function () { + setEventListener("rejectUnlinkFxaAccount", "command", function () { gSyncPane.unlinkFirefoxAccount(true); }); setEventListener("tosPP-small-ToS", "click", gSyncPane.openToS); diff --git a/browser/components/preferences/in-content/sync.xul b/browser/components/preferences/in-content/sync.xul index 1f4b364d0fa9..9bfaf028690a 100644 --- a/browser/components/preferences/in-content/sync.xul +++ b/browser/components/preferences/in-content/sync.xul @@ -200,112 +200,133 @@ - - - - - - + + + + + + &signedOut.description; + + + + + +