console: Add correct messages

Author: ryaplots

pkg/webui/components/qr-modal-button/index.js

@@ -26,10 +26,13 @@ import ErrorMessage from '@ttn-lw/lib/components/error-message'
 
 import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
+import { selectPluginTTSCloud } from '@ttn-lw/lib/selectors/env'
 
 import DataSheet from '../data-sheet'
 import QR from '../qr'
 
+const smUrl = selectPluginTTSCloud().subscription_management_url
+
 const QrScanDoc = (
   <Link.Anchor external secondary href="https://www.thethingsindustries.com/docs/">
     Having trouble?
@@ -100,7 +103,14 @@ const QRModalButton = props => {
                       />
                     </div>
                     <Message
-                      content={sharedMessages.fleetInfo}
+                      content={sharedMessages.fleetTokenInfo}
+                      values={{
+                        Link: val => (
+                          <Link.Anchor secondary href={`${smUrl}/dashboard`} external>
+                            {val}
+                          </Link.Anchor>
+                        ),
+                      }}
                       className="mb-cs-xs mt-cs-xxs c-text-neutral-light fs-s"
                       component="div"
                     />
@@ -113,7 +123,7 @@ const QRModalButton = props => {
                       onChange={handleFleetTokenChange}
                     />
                     <Message
-                      content={sharedMessages.fleetTokenInfo}
+                      content={sharedMessages.fleetInfo}
                       className="mt-cs-xs c-text-neutral-light fs-s"
                       component="div"
                     />

pkg/webui/console/containers/gateway-onboarding-form/gateway-provisioning-form/gateway-claim-form-section/index.js

@@ -31,12 +31,13 @@ import Message from '@ttn-lw/lib/components/message'
 
 import { GsFrequencyPlansSelect as FrequencyPlansSelect } from '@console/containers/freq-plans-select'
 
-import { selectGsConfig } from '@ttn-lw/lib/selectors/env'
+import { selectGsConfig, selectPluginTTSCloud } from '@ttn-lw/lib/selectors/env'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import tooltipIds from '@ttn-lw/lib/constants/tooltip-ids'
 import getHostFromUrl from '@ttn-lw/lib/host-from-url'
 
 const { enabled: gsEnabled, base_url: gsBaseURL } = selectGsConfig()
+const smUrl = selectPluginTTSCloud().subscription_management_url
 
 const m = defineMessages({
   claimWarning:
@@ -135,6 +136,13 @@ const GatewayClaimFormSection = () => {
         tooltipId={tooltipIds.CLAIM_AUTH_CODE}
         component={Input}
         description={activeOwnerTokenType === 'fleet' ? sharedMessages.fleetTokenInfo : undefined}
+        descriptionValues={{
+          Link: val => (
+            <Link.Anchor secondary href={`${smUrl}/dashboard`} external>
+              {val}
+            </Link.Anchor>
+          ),
+        }}
         encode={btoa}
         decode={atob}
         sensitive

pkg/webui/lib/shared-messages.js

@@ -278,8 +278,8 @@ export default defineMessages({
   fCnt: 'FCnt',
   fetching: 'Fetching data…',
   firmwareVersion: 'Firmware version',
-  fleetInfo: 'Adding a gateway to a fleet will blablabla.',
-  fleetTokenInfo: 'Your fleet token is available in your account.',
+  fleetInfo: 'Adding a gateway to a Fleet will claim the gateway using an available Slot.',
+  fleetTokenInfo: 'Your fleet token is available in <Link>your account.</Link>',
   format: 'Format',
   fpNotFoundError:
     'The LoRaWAN version <code>{lorawanVersion}</code> does not support the <code>{freqPlan}</code> frequency plan. Please choose a different MAC version or frequency plan.',

pkg/webui/locales/en.json

@@ -1446,8 +1446,8 @@
   "lib.shared-messages.fCnt": "FCnt",
   "lib.shared-messages.fetching": "Fetching data…",
   "lib.shared-messages.firmwareVersion": "Firmware version",
-  "lib.shared-messages.fleetInfo": "Adding a gateway to a fleet will blablabla.",
-  "lib.shared-messages.fleetTokenInfo": "Your fleet token is available in your account.",
+  "lib.shared-messages.fleetInfo": "Adding a gateway to a Fleet will claim the gateway using an available Slot.",
+  "lib.shared-messages.fleetTokenInfo": "Your fleet token is available in <Link>your account.</Link>",
   "lib.shared-messages.format": "Format",
   "lib.shared-messages.fpNotFoundError": "The LoRaWAN version <code>{lorawanVersion}</code> does not support the <code>{freqPlan}</code> frequency plan. Please choose a different MAC version or frequency plan.",
   "lib.shared-messages.fPort": "FPort",