Browse Source

Few fixes

master
Loëck Vézien 7 years ago
parent
commit
3df7b0d4b1
No known key found for this signature in database GPG Key ID: CBCDCE384E853AC4
  1. 2
      package.json
  2. 1
      src/components/RecipientAddress/index.js
  3. 10
      src/components/layout/Default.js
  4. 2
      src/components/modals/Send/index.js
  5. 2
      src/main/app.js
  6. 4
      src/styles/reset.js
  7. 16
      yarn.lock

2
package.json

@ -129,7 +129,7 @@
"eslint-config-prettier": "^2.9.0",
"eslint-import-resolver-babel-module": "^5.0.0-beta.0",
"eslint-plugin-flowtype": "^2.46.0",
"eslint-plugin-import": "^2.10.0",
"eslint-plugin-import": "^2.11.0",
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-react": "^7.7.0",
"flow-bin": "^0.69.0",

1
src/components/RecipientAddress/index.js

@ -28,6 +28,7 @@ const WrapperQrCode = styled(Box)`
position: absolute;
right: 0;
top: 100%;
z-index: 2;
`
type Props = {

10
src/components/layout/Default.js

@ -35,15 +35,7 @@ type Props = {
class Default extends Component<Props> {
componentDidMount() {
window.requestAnimationFrame(
() =>
(this._timeout = setTimeout(() => {
window.onAppReady()
if (process.platform === 'darwin') {
ipcRenderer.send('touch-bar-init')
}
}, 300)),
)
window.requestAnimationFrame(() => (this._timeout = setTimeout(() => window.onAppReady(), 300)))
}
componentWillReceiveProps(nextProps: Props) {

2
src/components/modals/Send/index.js

@ -140,7 +140,7 @@ class SendModal extends PureComponent<Props, State> {
<ModalBody onClose={onClose} deferHeight={acc ? 630 : 355}>
<ModalTitle>{t('send:title')}</ModalTitle>
<ModalContent>
<Breadcrumb mb={5} mt={2} currentStep={stepIndex} items={this._steps} />
<Breadcrumb mb={5} currentStep={stepIndex} items={this._steps} />
{this.renderStep(acc)}
</ModalContent>
{acc && (

2
src/main/app.js

@ -85,7 +85,7 @@ function configureTouchBar(w) {
}),
]
ipcMain.on('touch-bar-init', () => w.setTouchBar(new TouchBar(defaultItems)))
w.setTouchBar(new TouchBar(defaultItems))
ipcMain.on('touch-bar-update', (e, d) => {
if (d.clear) {

4
src/styles/reset.js

@ -35,6 +35,10 @@ em {
font-style: italic;
}
#a11y-status-message {
display: none;
}
.scroll-content {
height: 100%;

16
yarn.lock

@ -3149,7 +3149,7 @@ builder-util@5.7.4, builder-util@^5.6.7, builder-util@^5.7.0, builder-util@^5.7.
stat-mode "^0.2.2"
temp-file "^3.1.1"
builtin-modules@^1.0.0, builtin-modules@^1.1.1:
builtin-modules@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@ -5223,11 +5223,10 @@ eslint-plugin-flowtype@^2.46.0:
dependencies:
lodash "^4.15.0"
eslint-plugin-import@^2.10.0:
version "2.10.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.10.0.tgz#fa09083d5a75288df9c6c7d09fe12255985655e7"
eslint-plugin-import@^2.11.0:
version "2.11.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.11.0.tgz#15aeea37a67499d848e8e981806d4627b5503816"
dependencies:
builtin-modules "^1.1.1"
contains-path "^0.1.0"
debug "^2.6.8"
doctrine "1.5.0"
@ -5237,6 +5236,7 @@ eslint-plugin-import@^2.10.0:
lodash "^4.17.4"
minimatch "^3.0.3"
read-pkg-up "^2.0.0"
resolve "^1.6.0"
eslint-plugin-jsx-a11y@^6.0.3:
version "6.0.3"
@ -10835,6 +10835,12 @@ resolve@^1.3.2:
dependencies:
path-parse "^1.0.5"
resolve@^1.6.0:
version "1.7.1"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
dependencies:
path-parse "^1.0.5"
responselike@1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"

Loading…
Cancel
Save