From 19f1491e3ab4b15e8872ab8f5f4c7d4a74af416b Mon Sep 17 00:00:00 2001
From: Innokentii Konstantinov <innokenty.konstantinov@grafana.com>
Date: Mon, 6 Mar 2023 17:43:00 +0800
Subject: [PATCH] Fix wording for cloud notifications (#1458)

# What this PR does
Fix message on Phone Verification tab.
---
 .../CloudPhoneSettings/CloudPhoneSettings.tsx | 20 ++++++-------------
 .../pages/settings/tabs/Cloud/CloudPage.tsx   |  4 +++-
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/grafana-plugin/src/containers/UserSettings/parts/tabs/CloudPhoneSettings/CloudPhoneSettings.tsx b/grafana-plugin/src/containers/UserSettings/parts/tabs/CloudPhoneSettings/CloudPhoneSettings.tsx
index a500ff34e4..acc4cb255e 100644
--- a/grafana-plugin/src/containers/UserSettings/parts/tabs/CloudPhoneSettings/CloudPhoneSettings.tsx
+++ b/grafana-plugin/src/containers/UserSettings/parts/tabs/CloudPhoneSettings/CloudPhoneSettings.tsx
@@ -7,7 +7,6 @@ import PluginLink from 'components/PluginLink/PluginLink';
 import Text from 'components/Text/Text';
 import { WithPermissionControlDisplay } from 'containers/WithPermissionControl/WithPermissionControlDisplay';
 import { User } from 'models/user/user.types';
-import { AppFeature } from 'state/features';
 import { WithStoreProps } from 'state/types';
 import { useStore } from 'state/useStore';
 import { withMobXProviderContext } from 'state/withStore';
@@ -50,21 +49,14 @@ const CloudPhoneSettings = observer((props: CloudPhoneSettingsProps) => {
   const UserCloudStatus = () => {
     switch (userStatus) {
       case 0:
-        if (store.hasFeature(AppFeature.CloudNotifications)) {
-          return (
-            <VerticalGroup spacing="lg">
-              <Text>Your account successfully matched, but Cloud is not connected. </Text>
-              <PluginLink query={{ page: 'cloud' }}>
-                <Button variant="secondary" icon="external-link-alt">
-                  Open Grafana Cloud page
-                </Button>
-              </PluginLink>
-            </VerticalGroup>
-          );
-        }
         return (
           <VerticalGroup spacing="lg">
-            <Text>Grafana Cloud is not synced</Text>
+            <Text>Cloud notifications enabled, but Grafana Cloud instance is not connected.</Text>
+            <PluginLink query={{ page: 'cloud' }}>
+              <Button variant="secondary" icon="external-link-alt">
+                Open Grafana Cloud page
+              </Button>
+            </PluginLink>
           </VerticalGroup>
         );
       case 1:
diff --git a/grafana-plugin/src/pages/settings/tabs/Cloud/CloudPage.tsx b/grafana-plugin/src/pages/settings/tabs/Cloud/CloudPage.tsx
index 6eb3a7cffd..bb5c60c3d0 100644
--- a/grafana-plugin/src/pages/settings/tabs/Cloud/CloudPage.tsx
+++ b/grafana-plugin/src/pages/settings/tabs/Cloud/CloudPage.tsx
@@ -365,7 +365,9 @@ const CloudPage = observer((props: CloudPageProps) => {
             <Icon name="bell" className={cx('block-icon')} size="lg" /> SMS and phone call notifications
           </Text.Title>
 
-          <Text type="secondary">Users matched between OSS and Cloud OnCall currently unavailable.</Text>
+          <Text type="secondary">
+            Connecting to Cloud OnCall enables sending SMS and phone call notifications using the cloud Grafana OnCall.
+          </Text>
         </VerticalGroup>
       </Block>
       {store.hasFeature(AppFeature.MobileApp) && (