diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 53588c30..78202c37 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,7 +4,6 @@ on: push: branches: [ develop ] pull_request: - branches: [ develop ] jobs: lint: @@ -16,4 +15,4 @@ jobs: with: node-version: 16 - run: yarn --ignore-scripts --pure-lockfile --strict-semver - - run: yarn lint \ No newline at end of file + - run: yarn lint diff --git a/.github/workflows/newsfile.yml b/.github/workflows/newsfile.yml index 87a1285c..23c8dc5a 100644 --- a/.github/workflows/newsfile.yml +++ b/.github/workflows/newsfile.yml @@ -2,7 +2,6 @@ name: Newsfile on: pull_request: - branches: [ develop ] workflow_dispatch: jobs: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d89c8beb..188335b2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,7 +4,6 @@ on: push: branches: [ develop ] pull_request: - branches: [ develop ] jobs: unit: @@ -53,4 +52,4 @@ jobs: --env POSTGRES_PASSWORD=pass \ --env POSTGRES_INITDB_ARGS="--lc-collate C --lc-ctype C --encoding UTF8" \ postgres:11 - - run: yarn test:postgres \ No newline at end of file + - run: yarn test:postgres diff --git a/changelog.d/734.misc b/changelog.d/734.misc new file mode 100644 index 00000000..45a2b342 --- /dev/null +++ b/changelog.d/734.misc @@ -0,0 +1 @@ +Add a new UI widget for linking and unlinking channels from within a Matrix room. diff --git a/changelog.d/735.misc b/changelog.d/735.misc new file mode 100644 index 00000000..45a2b342 --- /dev/null +++ b/changelog.d/735.misc @@ -0,0 +1 @@ +Add a new UI widget for linking and unlinking channels from within a Matrix room. diff --git a/widget/src/SlackApp.tsx b/widget/src/SlackApp.tsx index 66abddae..bda5c3b1 100644 --- a/widget/src/SlackApp.tsx +++ b/widget/src/SlackApp.tsx @@ -305,7 +305,7 @@ const Unlinked = ({ /> ; } else if (error) { - content = { error } + content = { error }; } else { content = Loading...; } diff --git a/widget/src/components/icons/Alert.tsx b/widget/src/components/icons/Alert.tsx index 2826b01e..779a3ae4 100644 --- a/widget/src/components/icons/Alert.tsx +++ b/widget/src/components/icons/Alert.tsx @@ -1,5 +1,5 @@ -import * as React from 'react' -import { SVGProps } from 'react' +import * as React from 'react'; +import { SVGProps } from 'react'; export const Alert = (props: SVGProps) => (