Merge pull request #1392 from 0xProject/fix/instant/pre-release-hotfixes

[instant] CSS leakage and non-lowercase defaultAssetData fix
This commit is contained in:
Francesco Agosti
2018-12-05 12:45:16 -08:00
committed by GitHub
4 changed files with 10 additions and 5 deletions

View File

@@ -15,6 +15,10 @@ input {
height: 100px;
}
input::-webkit-input-placeholder {
color: #b4b4b4 !important;
}
div {
padding: 3px;
}

View File

@@ -29,8 +29,8 @@ export const Input =
outline: none;
border: none;
&::placeholder {
color: ${props => props.theme[props.fontColor || 'white']};
opacity: 0.5;
color: ${props => props.theme[props.fontColor || 'white']} !important;
opacity: 0.5 !important;
}
}
`;

View File

@@ -60,7 +60,8 @@ export class ZeroExInstantProvider extends React.Component<ZeroExInstantProvider
);
// merge the additional additionalAssetMetaDataMap with our default map
const completeAssetMetaDataMap = {
...props.additionalAssetMetaDataMap,
// Make sure the passed in assetDatas are lower case
..._.mapKeys(props.additionalAssetMetaDataMap || {}, (value, key) => key.toLowerCase()),
...defaultState.assetMetaDataMap,
};
// construct the final state

View File

@@ -26,7 +26,7 @@ export const assetUtils = {
return;
}
return {
assetData,
assetData: assetData.toLowerCase(),
metaData,
};
},
@@ -36,7 +36,7 @@ export const assetUtils = {
network: Network,
): Asset => {
return {
assetData,
assetData: assetData.toLowerCase(),
metaData: assetUtils.getMetaDataOrThrow(assetData, assetMetaDataMap, network),
};
},