fix after rebase

dis-moi · Aug 4, 2019 · f4f5bf9 · f4f5bf9
1 parent d224914
commit f4f5bf9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 39 deletions.
diff --git a/src/app/background/sagas/index.ts b/src/app/background/sagas/index.ts
@@ -2,7 +2,6 @@ import { fork, all } from 'redux-saga/effects';
 import matchingContexts from './matchingContexts';
 import tab from './tab';
 import badge from './badge';
-import contribution from './contribution';
 import externalMessage from './externalMessage';
 import theme from '../../theme';
 import error from '../../sagas/error';
@@ -12,7 +11,6 @@ export default function* rootSaga() {
     fork(matchingContexts),
     fork(tab),
     fork(badge(theme.badge)),
-    fork(contribution),
     fork(externalMessage),
     fork(error)
   ]);

diff --git a/...content/App/Contribute/ContributeScreen/SubmitContributionForm/SubmitContributionForm.tsx b/...content/App/Contribute/ContributeScreen/SubmitContributionForm/SubmitContributionForm.tsx
@@ -1,8 +1,7 @@
 import React, { Component } from 'react';
 import { Field, InjectedFormProps } from 'redux-form';
 import { Form, Error } from 'components/atoms/Forms';
-import { CenterContainer } from 'components/atoms';
-import BorderButton from 'components/atoms/Buttons/BorderButton';
+import { CenterContainer, BorderButton } from 'components/atoms';
 import {
   InputField,
   IntentionsSelectorField,

diff --git a/src/components/atoms/Button/Button.tsx b/src/components/atoms/Button/Button.tsx
@@ -8,15 +8,17 @@ import Loading from 'components/atoms/icons/Loading';
 export interface ButtonContainerProps {
   theme?: Theme;
   href?: string;
+  to?: string;
   target?: '_blank';
   rel?: string;
   onClick?: (...args: any[]) => any;
+  disabled?: boolean;
+  type?: 'submit' | 'reset' | 'button';
 }
 
 export interface ButtonProps extends ButtonContainerProps {
   loading?: boolean;
   children?: ReactNode | string;
-  disabled?: boolean;
   dangerouslySetInnerHTML?: any;
 }
 
@@ -66,15 +68,8 @@ export const ButtonContainer = styled.button<ButtonContainerProps>`
   }
 `;
 
-export default ({
-  loading,
-  children,
-  target,
-  rel,
-  href,
-  ...props
-}: ButtonProps) => (
-  <ButtonContainer href={href} target={target} rel={rel} {...props}>
+export default ({ loading, children, ...props }: ButtonProps) => (
+  <ButtonContainer {...props}>
     {loading ? (
       <LoadingRotator>
         <Loading />

diff --git a/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.tsx b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.tsx
diff --git a/src/components/atoms/Buttons/BorderButton/BorderButton.ts b/src/components/atoms/Buttons/BorderButton/BorderButton.ts