2 files changed, 39 insertions, 36 deletions
diff --git a/src/components/layout/AppLayout.tsx b/src/components/layout/AppLayout.tsx
index c2468e852..9ea5463a2 100644
--- a/src/components/layout/AppLayout.tsx
+++ b/src/components/layout/AppLayout.tsx
@@ -157,18 +157,19 @@ class AppLayout extends Component<IProps, IState> {
              {sidebar}
              <div className="app__service">
                <WorkspaceSwitchingIndicator />
-                {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
+                {!areRequiredRequestsSuccessful &&
-                  <InfoBar
+                  showRequiredRequestsError && (
-                    type="danger"
+                    <InfoBar
-                    ctaLabel="Try again"
+                      type="danger"
-                    ctaLoading={areRequiredRequestsLoading}
+                      ctaLabel="Try again"
-                    sticky
+                      ctaLoading={areRequiredRequestsLoading}
-                    onClick={retryRequiredRequests}
+                      sticky
-                  >
+                      onClick={retryRequiredRequests}
-                    <Icon icon={mdiFlash} />
+                    >
-                    {intl.formatMessage(messages.requiredRequestsFailed)}
+                      <Icon icon={mdiFlash} />
-                  </InfoBar>
+                      {intl.formatMessage(messages.requiredRequestsFailed)}
-                )}
+                    </InfoBar>
+                  )}
                {authRequestFailed && (
                  <InfoBar
                    type="danger"
diff --git a/src/features/workspaces/components/WorkspacesDashboard.tsx b/src/features/workspaces/components/WorkspacesDashboard.tsx
index 60fc7a0ce..06738b38c 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.tsx
+++ b/src/features/workspaces/components/WorkspacesDashboard.tsx
@@ -101,32 +101,34 @@ class WorkspacesDashboard extends Component<IProps> {
        </div>
        <div className="settings__body">
          {/* ===== Workspace updated info ===== */}
-          {updateWorkspaceRequest.wasExecuted && updateWorkspaceRequest.result && (
+          {updateWorkspaceRequest.wasExecuted &&
-            <Appear className={classes.appear}>
+            updateWorkspaceRequest.result && (
-              <Infobox
+              <Appear className={classes.appear}>
-                type="success"
+                <Infobox
-                icon="checkbox-marked-circle-outline"
+                  type="success"
-                dismissible
+                  icon="checkbox-marked-circle-outline"
-                onUnmount={updateWorkspaceRequest.reset}
+                  dismissible
-              >
+                  onUnmount={updateWorkspaceRequest.reset}
-                {intl.formatMessage(messages.updatedInfo)}
+                >
-              </Infobox>
+                  {intl.formatMessage(messages.updatedInfo)}
-            </Appear>
+                </Infobox>
-          )}
+              </Appear>
+            )}
          {/* ===== Workspace deleted info ===== */}
-          {deleteWorkspaceRequest.wasExecuted && deleteWorkspaceRequest.result && (
+          {deleteWorkspaceRequest.wasExecuted &&
-            <Appear className={classes.appear}>
+            deleteWorkspaceRequest.result && (
-              <Infobox
+              <Appear className={classes.appear}>
-                type="success"
+                <Infobox
-                icon="checkbox-marked-circle-outline"
+                  type="success"
-                dismissible
+                  icon="checkbox-marked-circle-outline"
-                onUnmount={deleteWorkspaceRequest.reset}
+                  dismissible
-              >
+                  onUnmount={deleteWorkspaceRequest.reset}
-                {intl.formatMessage(messages.deletedInfo)}
+                >
-              </Infobox>
+                  {intl.formatMessage(messages.deletedInfo)}
-            </Appear>
+                </Infobox>
-          )}
+              </Appear>
+            )}
          {/* ===== Create workspace form ===== */}
          <div className={classes.createForm}>

diff --git a/src/components/layout/AppLayout.tsx b/src/components/layout/AppLayout.tsx index c2468e852..9ea5463a2 100644 --- a/src/components/layout/AppLayout.tsx +++ b/src/components/layout/AppLayout.tsx
@@ -157,18 +157,19 @@ class AppLayout extends Component<IProps, IState> {
157	{sidebar}	157	{sidebar}
158	<div className="app__service">	158	<div className="app__service">
159	<WorkspaceSwitchingIndicator />	159	<WorkspaceSwitchingIndicator />
160	{!areRequiredRequestsSuccessful && showRequiredRequestsError && (	160	{!areRequiredRequestsSuccessful &&
161	<InfoBar	161	showRequiredRequestsError && (
162	type="danger"	162	<InfoBar
163	ctaLabel="Try again"	163	type="danger"
164	ctaLoading={areRequiredRequestsLoading}	164	ctaLabel="Try again"
165	sticky	165	ctaLoading={areRequiredRequestsLoading}
166	onClick={retryRequiredRequests}	166	sticky
167	>	167	onClick={retryRequiredRequests}
168	<Icon icon={mdiFlash} />	168	>
169	{intl.formatMessage(messages.requiredRequestsFailed)}	169	<Icon icon={mdiFlash} />
170	</InfoBar>	170	{intl.formatMessage(messages.requiredRequestsFailed)}
171	)}	171	</InfoBar>
		172	)}
172	{authRequestFailed && (	173	{authRequestFailed && (
173	<InfoBar	174	<InfoBar
174	type="danger"	175	type="danger"


diff --git a/src/features/workspaces/components/WorkspacesDashboard.tsx b/src/features/workspaces/components/WorkspacesDashboard.tsx index 60fc7a0ce..06738b38c 100644 --- a/src/features/workspaces/components/WorkspacesDashboard.tsx +++ b/src/features/workspaces/components/WorkspacesDashboard.tsx
@@ -101,32 +101,34 @@ class WorkspacesDashboard extends Component<IProps> {
101	</div>	101	</div>
102	<div className="settings__body">	102	<div className="settings__body">
103	{/* ===== Workspace updated info ===== */}	103	{/* ===== Workspace updated info ===== */}
104	{updateWorkspaceRequest.wasExecuted && updateWorkspaceRequest.result && (	104	{updateWorkspaceRequest.wasExecuted &&
105	<Appear className={classes.appear}>	105	updateWorkspaceRequest.result && (
106	<Infobox	106	<Appear className={classes.appear}>
107	type="success"	107	<Infobox
108	icon="checkbox-marked-circle-outline"	108	type="success"
109	dismissible	109	icon="checkbox-marked-circle-outline"
110	onUnmount={updateWorkspaceRequest.reset}	110	dismissible
111	>	111	onUnmount={updateWorkspaceRequest.reset}
112	{intl.formatMessage(messages.updatedInfo)}	112	>
113	</Infobox>	113	{intl.formatMessage(messages.updatedInfo)}
114	</Appear>	114	</Infobox>
115	)}	115	</Appear>
		116	)}
116		117
117	{/* ===== Workspace deleted info ===== */}	118	{/* ===== Workspace deleted info ===== */}
118	{deleteWorkspaceRequest.wasExecuted && deleteWorkspaceRequest.result && (	119	{deleteWorkspaceRequest.wasExecuted &&
119	<Appear className={classes.appear}>	120	deleteWorkspaceRequest.result && (
120	<Infobox	121	<Appear className={classes.appear}>
121	type="success"	122	<Infobox
122	icon="checkbox-marked-circle-outline"	123	type="success"
123	dismissible	124	icon="checkbox-marked-circle-outline"
124	onUnmount={deleteWorkspaceRequest.reset}	125	dismissible
125	>	126	onUnmount={deleteWorkspaceRequest.reset}
126	{intl.formatMessage(messages.deletedInfo)}	127	>
127	</Infobox>	128	{intl.formatMessage(messages.deletedInfo)}
128	</Appear>	129	</Infobox>
129	)}	130	</Appear>
		131	)}
130		132
131	{/* ===== Create workspace form ===== */}	133	{/* ===== Create workspace form ===== */}
132	<div className={classes.createForm}>	134	<div className={classes.createForm}>