diff --git a/src/components/layout/Paragraph/index.js b/src/components/layout/Paragraph/index.js index 46db76e4..5de1372f 100644 --- a/src/components/layout/Paragraph/index.js +++ b/src/components/layout/Paragraph/index.js @@ -6,7 +6,7 @@ import styles from './index.scss' const cx = classNames.bind(styles) type Props = { - layout?: 'center' | 'left', + align?: 'right' | 'center' | 'left', noMargin?: boolean, bold?: boolean, size?: 'sm' | 'md' | 'lg' | 'xl', @@ -17,11 +17,11 @@ type Props = { class Paragraph extends React.PureComponent { render() { const { - bold, children, color, layout, size, noMargin, ...props + bold, children, color, align, size, noMargin, ...props } = this.props return ( -

+

{ children }

) diff --git a/src/components/layout/Paragraph/index.scss b/src/components/layout/Paragraph/index.scss index f27c1faa..3ddb5960 100644 --- a/src/components/layout/Paragraph/index.scss +++ b/src/components/layout/Paragraph/index.scss @@ -31,6 +31,10 @@ text-align: left; } +.right { + text-align: right; +} + .sm { font-size: $smallFontSize; } diff --git a/src/routes/open/components/FormConfirmation/index.jsx b/src/routes/open/components/FormConfirmation/index.jsx index 8af119cc..647a47e0 100644 --- a/src/routes/open/components/FormConfirmation/index.jsx +++ b/src/routes/open/components/FormConfirmation/index.jsx @@ -35,10 +35,10 @@ export default ({ address, tx }: Props) => ({ submitting }: FormProps) => { { !txFinished && - + You are about to create a Safe for keeping your funds more secure. - + Remember to check you have enough funds in your wallet. diff --git a/src/routes/safe/component/Withdrawn/Review.jsx b/src/routes/safe/component/Withdrawn/Review.jsx index 82cbc4f5..ce73827b 100644 --- a/src/routes/safe/component/Withdrawn/Review.jsx +++ b/src/routes/safe/component/Withdrawn/Review.jsx @@ -13,10 +13,10 @@ type FormProps = { const Review = () => ({ values }: FormProps) => ( Review the Withdrawn Operation - + Destination: {values[DESTINATION_PARAM]} - + Value in ETH: {values[VALUE_PARAM]} diff --git a/src/routes/safe/component/Withdrawn/withdrawn.js b/src/routes/safe/component/Withdrawn/withdrawn.js index 9981bc23..90344954 100644 --- a/src/routes/safe/component/Withdrawn/withdrawn.js +++ b/src/routes/safe/component/Withdrawn/withdrawn.js @@ -1,12 +1,17 @@ // @flow +import { getWeb3 } from '~/wallets/getWeb3' import { getGnosisSafeContract, getCreateDailyLimitExtensionContract } from '~/wallets/safeContracts' export const DESTINATION_PARAM = 'destination' export const VALUE_PARAM = 'ether' const withdrawn = async (values: Object, safeAddress: string, userAccount: string): Promise => { - const gnosisSafe = getGnosisSafeContract().at(safeAddress) - const dailyLimitExtension = getCreateDailyLimitExtensionContract().at(gnosisSafe.getExtensions()[0]) + const web3 = getWeb3() + const gnosisSafe = getGnosisSafeContract(web3).at(safeAddress) + + const extensions = await gnosisSafe.getExtensions() + const dailyAddress = extensions[0] + const dailyLimitExtension = getCreateDailyLimitExtensionContract(web3).at(dailyAddress) if (await dailyLimitExtension.gnosisSafe() !== gnosisSafe.address) { throw new Error('Using an extension of different safe')