Merge branch 'update-support-page' into master

2 files changed, 12 insertions, 15 deletions

diff --git a/gui/src/renderer/components/Support.tsx b/gui/src/renderer/components/Support.tsx
index c685ebe946..9436636516 100644
--- a/gui/src/renderer/components/Support.tsx
+++ b/gui/src/renderer/components/Support.tsx
@@ -18,10 +18,10 @@ import {
   StyledForm,
   StyledFormEmailRow,
   StyledFormMessageRow,
-  StyledSecureStatus,
   StyledSendStatus,
   StyledSentMessage,
   StyledStatusIcon,
+  StyledThanks,
   StyledMessageInput,
 } from './SupportStyles';
 
@@ -112,7 +112,11 @@ export default class Support extends React.Component<ISupportProps, ISupportStat
     const sendState = this.state.sendState;
     if (sendState === SendState.Initial && this.state.email.length === 0) {
       this.setState({ sendState: SendState.Confirm });
-    } else if (sendState === SendState.Initial || sendState === SendState.Confirm) {
+    } else if (
+      sendState === SendState.Initial ||
+      sendState === SendState.Confirm ||
+      sendState === SendState.Failed
+    ) {
       try {
         await this.sendReport();
       } catch (error) {
@@ -333,7 +337,6 @@ export default class Support extends React.Component<ISupportProps, ISupportStat
           <StyledStatusIcon>
             <ImageView source="icon-spinner" height={60} width={60} />
           </StyledStatusIcon>
-          <StyledSecureStatus>{messages.gettext('SECURE CONNECTION')}</StyledSecureStatus>
           <StyledSendStatus>{messages.pgettext('support-view', 'Sending...')}</StyledSendStatus>
         </StyledForm>
       </StyledContent>
@@ -356,11 +359,11 @@ export default class Support extends React.Component<ISupportProps, ISupportStat
           <StyledStatusIcon>
             <ImageView source="icon-success" height={60} width={60} />
           </StyledStatusIcon>
-          <StyledSecureStatus>{messages.gettext('SECURE CONNECTION')}</StyledSecureStatus>
           <StyledSendStatus>{messages.pgettext('support-view', 'Sent')}</StyledSendStatus>
 
           <StyledSentMessage>
-            {messages.pgettext('support-view', 'Thanks! We will look into this.')}
+            <StyledThanks>{messages.pgettext('support-view', 'Thanks!')} </StyledThanks>
+            {messages.pgettext('support-view', 'We will look into this.')}
           </StyledSentMessage>
           {this.state.email.trim().length > 0 ? (
             <StyledSentMessage>{reachBackMessage}</StyledSentMessage>
@@ -377,7 +380,6 @@ export default class Support extends React.Component<ISupportProps, ISupportStat
           <StyledStatusIcon>
             <ImageView source="icon-fail" height={60} width={60} />
           </StyledStatusIcon>
-          <StyledSecureStatus>{messages.gettext('SECURE CONNECTION')}</StyledSecureStatus>
           <StyledSendStatus>{messages.pgettext('support-view', 'Failed to send')}</StyledSendStatus>
           <StyledSentMessage>
             {messages.pgettext(
diff --git a/gui/src/renderer/components/SupportStyles.tsx b/gui/src/renderer/components/SupportStyles.tsx
index 139890b3b6..ebaf5e0e8a 100644
--- a/gui/src/renderer/components/SupportStyles.tsx
+++ b/gui/src/renderer/components/SupportStyles.tsx
@@ -77,20 +77,15 @@ export const StyledSentMessage = styled.span(smallText, {
   color: colors.white60,
 });
 
+export const StyledThanks = styled.span({
+  color: colors.green,
+});
+
 export const StyledEmail = styled.span({
   fontWeight: 900,
   color: colors.white,
 });
 
-export const StyledSecureStatus = styled.span({
-  fontFamily: 'Open Sans',
-  fontSize: '16px',
-  fontWeight: 800,
-  lineHeight: '22px',
-  marginBottom: '4px',
-  color: colors.green,
-});
-
 export const StyledSendStatus = styled.span(bigText, {
   marginBottom: '4px',
 });