From c2bf5ed35eef9775840f882a2b771300aad3105b Mon Sep 17 00:00:00 2001 From: Cezar Augusto Date: Thu, 3 Jan 2019 20:16:21 -0200 Subject: [PATCH] Merge pull request #332 from brave/sync-spec update Sync spec and fix several brave-core issues --- src/components/popupModals/alertBox/index.tsx | 4 +- src/components/popupModals/alertBox/style.ts | 8 +- src/components/popupModals/modal/index.tsx | 14 +- src/features/sync/grid/index.ts | 21 +- src/features/sync/images/desktop_icon.png | Bin 0 -> 43052 bytes src/features/sync/images/desktop_icon.svg | 1 - src/features/sync/images/index.ts | 15 +- src/features/sync/images/mobile_icon.png | Bin 0 -> 39921 bytes src/features/sync/images/mobile_icon.svg | 1 - src/features/sync/images/mobile_picture.png | Bin 20931 -> 17983 bytes src/features/sync/images/sync_computer.svg | 1 + src/features/sync/images/sync_devices.svg | 1 + src/features/sync/images/sync_hand.svg | 1 + src/features/sync/index.ts | 14 +- src/features/sync/misc/index.ts | 31 ++- src/features/sync/modal/index.ts | 36 ++-- src/features/sync/text/index.ts | 16 +- stories/features/sync/disabledContent.tsx | 57 +++--- stories/features/sync/enabledContent.tsx | 182 ++++++++++-------- stories/features/sync/modals.tsx | 6 +- .../sync/modals/addNewChainCameraOption.tsx | 104 ---------- .../sync/modals/addNewChainNoCamera.tsx | 71 ------- stories/features/sync/modals/deviceType.tsx | 55 ++---- .../features/sync/modals/enterSyncCode.tsx | 36 ++-- .../features/sync/modals/removeMainDevice.tsx | 11 +- .../sync/modals/removeOtherDevice.tsx | 9 +- stories/features/sync/modals/resetSync.tsx | 16 +- stories/features/sync/modals/scanCode.tsx | 79 ++++---- stories/features/sync/modals/viewSyncCode.tsx | 72 ++++--- stories/features/sync/page/fakeLocale.ts | 70 +++---- 30 files changed, 410 insertions(+), 522 deletions(-) create mode 100644 src/features/sync/images/desktop_icon.png delete mode 100644 src/features/sync/images/desktop_icon.svg create mode 100644 src/features/sync/images/mobile_icon.png delete mode 100644 src/features/sync/images/mobile_icon.svg create mode 100644 src/features/sync/images/sync_computer.svg create mode 100644 src/features/sync/images/sync_devices.svg create mode 100644 src/features/sync/images/sync_hand.svg delete mode 100644 stories/features/sync/modals/addNewChainCameraOption.tsx delete mode 100644 stories/features/sync/modals/addNewChainNoCamera.tsx diff --git a/src/components/popupModals/alertBox/index.tsx b/src/components/popupModals/alertBox/index.tsx index 955ca8533..e986c2ad0 100644 --- a/src/components/popupModals/alertBox/index.tsx +++ b/src/components/popupModals/alertBox/index.tsx @@ -3,7 +3,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ import * as React from 'react' -import { StyledDialog, StyledFooter, StyledCancelContainer } from './style' +import { StyledDialogWrapper, StyledDialog, StyledFooter, StyledCancelContainer } from './style' import Button from '../../buttonsIndicators/button' export interface Props { @@ -24,6 +24,7 @@ export default class AlertBox extends React.PureComponent { const { testId, children, ...buttonProps } = this.props const { colorType, onClickCancel, cancelString, onClickOk, okString } = buttonProps return ( +
{children}
@@ -37,6 +38,7 @@ export default class AlertBox extends React.PureComponent {