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

Merge pull request #2409 from 0xProject/feature/instant/minor-fixes-dai-aggregator

Browse Source 
Fixes for instant (DAI + disable aggregator functionality)
This commit is contained in:
David Sun
2019-12-19 20:21:59 -05:00
committed by GitHub
parent 71bfe9b745 ed4e90623d
commit b6ec09e6cf
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/instant/public/index.html
View File

@@ -199,7 +199,7 @@
};
const render = renderOptionsOverrides => {
const renderOptionsDefaults = {
orderSource: 'https://api.radarrelay.com/0x/v2/',
orderSource: 'https://api.0x.org/sra/',
onClose: () => {
console.log('0x Instant Closed');
},

6
packages/instant/src/assets/icons/dai.svg generated
View File

@@ -1,5 +1,3 @@
<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="13.0001" y="6.41421" width="9.3138" height="9.3138" transform="rotate(45 13.0001 6.41421)" stroke="white" stroke-width="2"/>
<rect x="13.0001" y="10.3334" width="3.77125" height="3.77125" transform="rotate(45 13.0001 10.3334)" fill="white"/>
<path d="M21.0001 13.0001L13.0001 21.0001L5 13.0001H21.0001Z" fill="white"/>
<svg width="26" height="15" viewBox="0 0 13 12" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M1.55837 0H6.04094C8.76769 0 10.8347 1.46575 11.6041 3.59775H13V4.88719H11.8983C11.9194 5.09031 11.9308 5.29831 11.9308 5.50956V5.54125C11.9308 5.7785 11.9169 6.0125 11.8893 6.24081H13V7.53025H11.5773C10.7876 9.633 8.73681 11.0841 6.04094 11.0841H1.55837V7.53025H0V6.24H1.55837V4.88719H0V3.59775H1.55837V0ZM2.81125 7.53025V9.92713H6.04094C8.034 9.92713 9.51438 8.96756 10.2042 7.53025H2.81125ZM10.5877 6.24081H2.81206V4.88719H10.5901C10.6186 5.10006 10.6332 5.31781 10.6332 5.54125V5.57294C10.6332 5.80044 10.6186 6.02387 10.5877 6.24081V6.24081ZM6.04094 1.15456C8.04294 1.15456 9.52819 2.14012 10.2131 3.59775H2.81125V1.15456H6.04094V1.15456Z" fill="white"/>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 431 B

After

Width:  |  Height:  |  Size: 812 B

2
packages/instant/src/data/asset_meta_data_map.ts
View File

@@ -192,7 +192,7 @@ export const assetMetaDataMap: ObjectMap<AssetMetaData> = {
symbol: 'ast',
name: 'AirSwap',
},
'0xf47261b000000000000000000000000089d24a6b4ccb1b6faa2625fe562bdd9a23260359': {
'0xf47261b00000000000000000000000006b175474e89094c44da98b954eedeac495271d0f': {
assetProxyId: AssetProxyId.ERC20,
decimals: 18,
primaryColor: '#DEA349',

4
packages/instant/src/util/swap_quote_updater.ts
View File

@@ -1,4 +1,4 @@
import { MarketBuySwapQuote, SwapQuoter } from '@0x/asset-swapper';
import { ERC20BridgeSource, MarketBuySwapQuote, SwapQuoter } from '@0x/asset-swapper';
import { AssetProxyId } from '@0x/types';
import { BigNumber } from '@0x/utils';
import { Web3Wrapper } from '@0x/web3-wrapper';
@@ -50,6 +50,8 @@ export const swapQuoteUpdater = {
{
slippagePercentage,
gasPrice: gasInfo.gasPriceInWei,
// Only use native orders
excludedSources: [ERC20BridgeSource.Eth2Dai, ERC20BridgeSource.Kyber, ERC20BridgeSource.Uniswap],
},
);
} catch (error) {

2
packages/instant/webpack.config.js
View File

@@ -62,7 +62,7 @@ const getRollbarTokens = (dischargeTarget, rollbarRequired) => {
};
const generateConfig = (dischargeTarget, heapConfigOptions, rollbarConfigOptions, nodeEnv) => {
const outputPath = process.env.WEBPACK_OUTPUT_PATH || 'umd';
const outputPath = process.env.WEBPACK_OUTPUT_PATH || 'umd/v3';
const { heapAnalyticsIdEnvName, heapAnalyticsIdRequired } = heapConfigOptions;
const heapAnalyticsId = process.env[heapAnalyticsIdEnvName];