crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1785 from 0xProject/feature/instant/erc721-screen-support

Browse Source 
Add overflow scroll to instant overlay & fix display bug
This commit is contained in:
Francesco Agosti
2019-04-22 20:39:15 -05:00
committed by GitHub
parent 7ea99baeb2 c687385974
commit 59ed5ae6b7
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/instant/src/components/ui/flex.tsx
View File

@@ -9,6 +9,7 @@ export interface FlexProps {
align?: 'flex-start' | 'center' | 'space-around' | 'space-between' | 'space-evenly' | 'flex-end';
width?: MediaChoice;
height?: MediaChoice;
overflow?: string;
backgroundColor?: ColorOption;
inline?: boolean;
flexGrow?: number | string;
@@ -25,6 +26,7 @@ export const Flex = styled.div<FlexProps>`
background-color: ${props => (props.backgroundColor ? props.theme[props.backgroundColor] : 'none')};
${props => (props.width ? stylesForMedia('width', props.width) : '')}
${props => (props.height ? stylesForMedia('height', props.height) : '')}
${props => (props.overflow ? `overflow: ${props.overflow}` : '')};
}
`;

2
packages/instant/src/components/zero_ex_instant_overlay.tsx
View File

@@ -20,7 +20,7 @@ export const ZeroExInstantOverlay: React.StatelessComponent<ZeroExInstantOverlay
return (
<ZeroExInstantProvider {...rest}>
<Overlay zIndex={zIndex} className={OVERLAY_DIV_CLASS}>
<Flex height="100vh">
<Flex height="100vh" overflow="scroll">
<Container
className={OVERLAY_CLOSE_BUTTON_DIV_CLASS}
position="absolute"

12
packages/instant/src/components/zero_ex_instant_provider.tsx
View File

@@ -57,10 +57,14 @@ export class ZeroExInstantProvider extends React.PureComponent<ZeroExInstantProv
networkId,
);
let selectedAssetUnitAmount: BigNumber | undefined = new BigNumber(1);
if (selectedAsset !== undefined && selectedAsset.metaData.assetProxyId === AssetProxyId.ERC20) {
selectedAssetUnitAmount =
props.defaultAssetBuyAmount === undefined ? undefined : new BigNumber(props.defaultAssetBuyAmount);
let selectedAssetUnitAmount: BigNumber | undefined;
if (selectedAsset !== undefined) {
if (selectedAsset.metaData.assetProxyId === AssetProxyId.ERC20) {
selectedAssetUnitAmount =
props.defaultAssetBuyAmount === undefined ? undefined : new BigNumber(props.defaultAssetBuyAmount);
} else if (selectedAsset.metaData.assetProxyId === AssetProxyId.ERC721) {
selectedAssetUnitAmount = new BigNumber(1);
}
}
// construct the final state