Merge branch

corinagum · corinagum · commit 1388c4fee6e7 · 2019-11-20T14:46:09.000-08:00
diff --git a/packages/component/src/ScreenReaderText.js b/packages/component/src/ScreenReaderText.js
@@ -15,7 +15,7 @@ const ROOT_CSS = css({
 });
 
 const ScreenReaderText = ({ text }) => {
-  const ariaLabel = !browser.chrome ? text : ' ';
+  const ariaLabel = browser.chrome ? ' ' : text;
   return (
     // Because of differences in browser implementations, <span aria-label> is used to make the screen reader perform the same on different browsers. This workaround was made to accommodate Chrome
     <span aria-label={ariaLabel} className={classNames(ROOT_CSS + '')}>
diff --git a/packages/component/src/SendBox/ConnectivityStatus.js b/packages/component/src/SendBox/ConnectivityStatus.js
@@ -104,7 +104,7 @@ const ConnectivityStatus = ({ connectivityStatus }) => {
         </div>
       </React.Fragment>
     ),
-    [connectivityStatusLabelText, connectivityNotificationStyleSet, initialConnectionText]
+    [connectivityNotificationStyleSet, connectivityStatusLabelText, initialConnectionText]
   );
 
   const renderReconnecting = useCallback(
@@ -117,7 +117,7 @@ const ConnectivityStatus = ({ connectivityStatus }) => {
         </div>
       </React.Fragment>
     ),
-    [connectivityStatusLabelText, connectivityNotificationStyleSet, interruptedConnectionText]
+    [connectivityNotificationStyleSet, connectivityStatusLabelText, interruptedConnectionText]
   );
 
   const renderSagaError = useCallback(
diff --git a/packages/component/src/SendBox/SuggestedActions.js b/packages/component/src/SendBox/SuggestedActions.js
@@ -36,13 +36,15 @@ const connectSuggestedActions = (...selectors) =>
 const SuggestedActions = ({ className, suggestedActions = [] }) => {
   const [{ suggestedActions: suggestedActionsStyleSet }] = useStyleSet();
   const [{ suggestedActionsStyleSet: suggestedActionsStyleSetForReactFilm }] = useStyleOptions();
-  const SAContent = useLocalize('SuggestedActionsContent');
-  const SAEmpty = useLocalize('SuggestedActionsEmpty');
-  const SAContainer = useLocalize('SuggestedActionsContainer') + (suggestedActions.length ? SAContent : SAEmpty);
+  const suggestedActionsContentText = useLocalize('SuggestedActionsContent');
+  const suggestedActionsEmptyText = useLocalize('SuggestedActionsEmpty');
+  const suggestedActionsContainerText =
+    useLocalize('SuggestedActionsContainer') +
+    (suggestedActions.length ? suggestedActionsContentText : suggestedActionsEmptyText);
 
   return (
     <div aria-label=" " aria-live="polite" role="status">
-      <ScreenReaderText text={SAContainer} />
+      <ScreenReaderText text={suggestedActionsContainerText} />
       {!!suggestedActions.length && (
         <BasicFilm
           autoCenter={false}
diff --git a/packages/core/src/reducers/suggestedActions.js b/packages/core/src/reducers/suggestedActions.js
@@ -7,7 +7,7 @@ export default function suggestedActions(state = DEFAULT_STATE, { payload = {},
   switch (type) {
     case SET_SUGGESTED_ACTIONS:
       if ((payload.suggestedActions || []).length) {
-        state = [].slice.call(payload.suggestedActions || []);
+        state = [].slice.call(payload.suggestedActions);
       } else {
         state = DEFAULT_STATE;
       }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ export default function suggestedActions(state = DEFAULT_STATE, { payload = {},`
`7`	`7`	`switch (type) {`
`8`	`8`	`case SET_SUGGESTED_ACTIONS:`
`9`	`9`	`if ((payload.suggestedActions \|\| []).length) {`
`10`		`- state = [].slice.call(payload.suggestedActions \|\| []);`
	`10`	`+ state = [].slice.call(payload.suggestedActions);`
`11`	`11`	`} else {`
`12`	`12`	`state = DEFAULT_STATE;`
`13`	`13`	`}`