FenjuFu commented on PR #540: URL: https://github.com/apache/fineract-backoffice-ui/pull/540#issuecomment-5738982400
@Aman-Mittal Conflicts are resolved. The branch is rebased onto current `main` (1d9e686, which includes #533), and all 4 commits are signed again. There were two conflicts: - `src/styles/_common.scss`: `main` now defines `--primary-text` with the values this PR used (`#2471a3` light, `#3498db` dark), plus `--warning-text` and `--success-text`. I kept `main`'s definitions and dropped this PR's duplicate, so the selected tab label still resolves to the same colours. - `eslint-suppressions.json`: merged both sides, then ran `npm run lint:prune`. The prune dropped stale entries such as `client-search-v2.component.ts`, which #533 removed. `npm run lint` passes with no unsuppressed errors. Checks I ran locally on the new head `11197fa`: `lint:prune`, `test:scripts` (34/34), `test:eslint-rules` (26/26), `typecheck:e2e`, `i18n:check` and `test:unit`. In the full `test:unit` run, 1488 of 1489 tests passed. The one failure was `client-form.component.test.ts`, which this PR doesn't touch, and it passes 8/8 when run alone, so it looks like a timeout under load. My earlier question about the tours is still open: should they move to the `ui-tabs` test id in rollout step 1, or in a separate PR? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
