feat: update link for subscription flag

Author: acezard

src/components/Bar.jsx

@@ -136,7 +136,9 @@ export class Bar extends Component {
 
   renderRight = () => {
     const { isPublic } = this.props
-    return !isPublic ? <Settings onLogOut={this.props.onLogOut} /> : null
+    return !isPublic ? (
+      <Settings client={this.props.cozyClient} onLogOut={this.props.onLogOut} />
+    ) : null
   }
 
   render() {

src/components/Settings/index.jsx

@@ -5,8 +5,10 @@ import get from 'lodash/get'
 
 import { translate } from 'cozy-ui/react/I18n'
 import { Button } from 'cozy-ui/react/Button'
-import { queryConnect } from 'cozy-client/dist'
+import { queryConnect, generateWebLink } from 'cozy-client/dist'
 import { models } from 'cozy-client'
+import flag from 'cozy-flags'
+
 let instanceModel = undefined
 let hasAnOffer = undefined
 let isFremiumFixed = undefined
@@ -92,7 +94,8 @@ export class Settings extends Component {
       contextQuery,
       storageData,
       settingsAppURL,
-      isFetching
+      isFetching,
+      client
     } = this.props
 
     let shouldDisplayViewOfferButton = false
@@ -114,7 +117,21 @@ export class Settings extends Component {
         shouldDisplayViewOfferButton =
           instanceModel.shouldDisplayOffers(data) || hasAnOffer(data)
 
-        managerUrlPremiumLink = instanceModel.buildPremiumLink(data)
+        const hasSubscription = flag('settings.subscription')
+
+        if (hasSubscription && client) {
+          const webLink = generateWebLink({
+            cozyUrl: client.getStackClient().uri,
+            hash: '/subscription',
+            pathname: '/',
+            slug: 'settings',
+            subDomainType: client.getInstanceOptions().subdomain
+          })
+
+          managerUrlPremiumLink = webLink
+        } else {
+          managerUrlPremiumLink = instanceModel.buildPremiumLink(data)
+        }
       }
     }
 

src/components/__snapshots__/Bar.spec.jsx.snap

@@ -38,7 +38,13 @@ exports[`Bar should change allow theme overrides 1`] = `
     <div
       className="u-flex-grow"
     />
-    <Wrapper />
+    <Wrapper
+      client={
+        CozyClient {
+          "uri": undefined,
+        }
+      }
+    />
     <Connect(Drawer)
       drawerListener={[Function]}
       onClose={[Function]}
@@ -82,7 +88,13 @@ exports[`Bar should change theme 1`] = `
     <div
       className="u-flex-grow"
     />
-    <Wrapper />
+    <Wrapper
+      client={
+        CozyClient {
+          "uri": undefined,
+        }
+      }
+    />
     <Connect(Drawer)
       drawerListener={[Function]}
       onClose={[Function]}
@@ -136,7 +148,13 @@ exports[`Bar should display the Searchbar 1`] = `
         }
       />
     </div>
-    <Wrapper />
+    <Wrapper
+      client={
+        CozyClient {
+          "uri": undefined,
+        }
+      }
+    />
     <Connect(Drawer)
       drawerListener={[Function]}
       onClose={[Function]}
@@ -225,7 +243,13 @@ exports[`Bar should not display searchbar if we are not on Cozy Drive 1`] = `
     <div
       className="u-flex-grow"
     />
-    <Wrapper />
+    <Wrapper
+      client={
+        CozyClient {
+          "uri": undefined,
+        }
+      }
+    />
     <Connect(Drawer)
       drawerListener={[Function]}
       onClose={[Function]}
@@ -271,7 +295,13 @@ exports[`Bar should not display searchbar if we are on mobile 1`] = `
     <div
       className="u-flex-grow"
     />
-    <Wrapper />
+    <Wrapper
+      client={
+        CozyClient {
+          "uri": undefined,
+        }
+      }
+    />
     <Connect(Drawer)
       drawerListener={[Function]}
       onClose={[Function]}

src/locales/fr.json

@@ -1,7 +1,7 @@
 {
   "drawer": "Afficher le menu latéral",
   "profile": "Profil",
-  "plans": "Forfait",
+  "plans": "Offres et options",
   "permissions": "Permissions",
   "connectedDevices": "Appareils connectés",
   "connections": "Connexions",