Merge branch 'dev' of github.com:MadOPcode/micro-frontends-taas-admin-app into dev

MadOPcode · MadOPcode · commit 7179cc7b8182 · 2021-06-18T08:02:00.000+03:00
diff --git a/src/routes/WorkPeriods/components/PeriodDetails/index.jsx b/src/routes/WorkPeriods/components/PeriodDetails/index.jsx
@@ -85,7 +85,7 @@ const PeriodDetails = ({ className, details, isDisabled, isFailed }) => {
       )}
     >
       {periodsIsLoading ? (
-        <td colSpan={8}>
+        <td colSpan={9}>
           <div className={styles.loadingIndicator}>Loading...</div>
         </td>
       ) : (

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ const PeriodDetails = ({ className, details, isDisabled, isFailed }) => {`
`85`	`85`	`)}`
`86`	`86`	`>`
`87`	`87`	`{periodsIsLoading ? (`
`88`		`- <td colSpan={8}>`
	`88`	`+ <td colSpan={9}>`
`89`	`89`	`<div className={styles.loadingIndicator}>Loading...</div>`
`90`	`90`	`</td>`
`91`	`91`	`) : (`