Skip to content

Commit

Permalink
Merge branch 'develop' into chore/bump-yoroi-eutxo-lib
Browse files Browse the repository at this point in the history
  • Loading branch information
vsubhuman authored Nov 27, 2024
2 parents 9158a0d + 20e62c6 commit 2d70eae
Show file tree
Hide file tree
Showing 100 changed files with 2,056 additions and 965 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/flow-and-lint.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Flow and lint
name: Flow and Lint and TSC

on:
workflow_dispatch:
Expand Down Expand Up @@ -43,4 +43,7 @@ jobs:
npm run flow
- name: lint
run: |
npm run eslint
npm run eslint
- name: tsc
run: |
npm run tsc
153 changes: 88 additions & 65 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/e2e-tests/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/e2e-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@emurgo/cardano-serialization-lib-nodejs": "^12.0.0-alpha.26",
"bignumber.js": "^9.1.2",
"chai": "^4.3.10",
"chromedriver": "130.0.1",
"chromedriver": "131.0.0",
"cross-env": "^7.0.3",
"json-server": "^0.17.4",
"mocha": "^10.2.0",
Expand Down
4 changes: 3 additions & 1 deletion packages/yoroi-extension/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,6 @@ Yoroi Shelley Testnet
.netlify

# SSL overrides for DEV
scripts/sslOverrides.js
scripts/sslOverrides.js

app/UI/**/*.d.ts
26 changes: 26 additions & 0 deletions packages/yoroi-extension/app/UI/components/BackButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { Button, Typography } from '@mui/material';
import { styled } from '@mui/material/styles';
import React from 'react';
import { ReactComponent as BackIcon } from '../../assets/images/assets-page/back-arrow.inline.svg';

const SButton = styled(Button)(({ theme }: any) => ({
color: theme.palette.ds.el_gray_medium,
'&.MuiButton-sizeMedium': {
padding: '13px 16px',
},
'& svg': {
'& path': {
fill: theme.palette.ds.el_gray_medium,
},
},
}));

export const BackButton = ({ label, onAction }: { label: string; onAction: () => void }) => {
return (
<SButton onClick={onAction} startIcon={<BackIcon />}>
<Typography fontWeight="500" fontSize="14px">
{label}
</Typography>
</SButton>
);
};
Loading

0 comments on commit 2d70eae

Please sign in to comment.