Skip to content
This repository was archived by the owner on Nov 10, 2023. It is now read-only.
Merged
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3bd8990
Merge branch 'development' of github.com:gnosis/safe-react into devel…
matextrem Apr 5, 2021
ef9427c
Merge branch 'development' of github.com:gnosis/safe-react into devel…
matextrem Apr 7, 2021
b496741
Update merge
matextrem Apr 12, 2021
f2f9c1b
Merge branch 'development' of github.com:gnosis/safe-react into devel…
matextrem Apr 20, 2021
714284e
Merge branch 'development' of github.com:gnosis/safe-react into devel…
matextrem Apr 21, 2021
90a9e9a
Merge branch 'development' of github.com:gnosis/safe-react into devel…
matextrem Apr 26, 2021
abe0022
Merge branch 'development' of github.com:gnosis/safe-react into devel…
matextrem Apr 29, 2021
c4d7c5f
Merge branch 'development' of github.com:gnosis/safe-react into devel…
matextrem May 6, 2021
b5c63d7
Merge branch 'development' of github.com:gnosis/safe-react into devel…
matextrem May 10, 2021
b83778d
Merge branch 'development' of github.com:gnosis/safe-react into devel…
matextrem May 18, 2021
22c2634
Merge branch 'development' of github.com:gnosis/safe-react into devel…
matextrem May 20, 2021
b82346b
Merge branch 'development' of github.com:gnosis/safe-react into devel…
matextrem May 27, 2021
5026178
Merge branch 'development' of github.com:gnosis/safe-react into devel…
matextrem Jun 8, 2021
de28524
Merge branch 'development' of github.com:gnosis/safe-react into devel…
matextrem Jun 10, 2021
b4c0e5e
Fix stepIndex transient prop
matextrem Jun 10, 2021
3afd4d4
Merge branch 'development' of github.com:gnosis/safe-react into bugfi…
matextrem Jun 11, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/routes/opening/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ const CardTitle = styled.div`

interface FullParagraphProps {
inversecolors: string
stepIndex: number
$stepIndex: number
}

const FullParagraph = styled(Paragraph)<FullParagraphProps>`
background-color: ${({ stepIndex }) => (stepIndex === 0 ? connected : background)};
color: ${({ theme, stepIndex }) => (stepIndex === 0 ? theme.colors.white : fontColor)};
background-color: ${({ $stepIndex }) => ($stepIndex === 0 ? connected : background)};
color: ${({ theme, $stepIndex }) => ($stepIndex === 0 ? theme.colors.white : fontColor)};
padding: 28px;
font-size: 20px;
margin-bottom: 16px;
Expand Down Expand Up @@ -336,7 +336,7 @@ export const SafeDeployment = ({
inversecolors={confirmationStep.toString()}
noMargin
size="md"
stepIndex={stepIndex}
$stepIndex={stepIndex}
>
{error ? 'You can Cancel or Retry the Safe creation process.' : steps[stepIndex].instruction}
</FullParagraph>
Expand Down