Merge remote-tracking branch 'upstream/development' into website

# Conflicts:
#	packages/website/package.json
#	packages/website/ts/style/colors.ts

4 files changed, 34 insertions, 7 deletions

diff --git a/packages/asset-buyer/CHANGELOG.json b/packages/asset-buyer/CHANGELOG.json
index b7a83ccfc..4ff83018e 100644
--- a/packages/asset-buyer/CHANGELOG.json
+++ b/packages/asset-buyer/CHANGELOG.json
@@ -1,5 +1,22 @@
 [
     {
+        "version": "3.0.3",
+        "changes": [
+            {
+                "note": "Update SRA order provider to include Dai"
+            }
+        ]
+    },
+    {
+        "timestamp": 1543401373,
+        "version": "3.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "version": "3.0.1",
         "changes": [
             {
diff --git a/packages/asset-buyer/CHANGELOG.md b/packages/asset-buyer/CHANGELOG.md
index 20702a531..be3ef67d1 100644
--- a/packages/asset-buyer/CHANGELOG.md
+++ b/packages/asset-buyer/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.0.2 - _November 28, 2018_
+
+    * Dependencies updated
+
 ## v3.0.1 - _November 21, 2018_
 
     * Dependencies updated (#1276)
diff --git a/packages/asset-buyer/package.json b/packages/asset-buyer/package.json
index 50b276704..780b2e3e2 100644
--- a/packages/asset-buyer/package.json
+++ b/packages/asset-buyer/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/asset-buyer",
-    "version": "3.0.1",
+    "version": "3.0.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -37,15 +37,15 @@
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/asset-buyer/README.md",
     "dependencies": {
         "@0x/assert": "^1.0.18",
-        "@0x/connect": "^3.0.7",
-        "@0x/contract-wrappers": "^4.1.0",
+        "@0x/connect": "^3.0.8",
+        "@0x/contract-wrappers": "^4.1.1",
         "@0x/json-schemas": "^2.1.2",
-        "@0x/order-utils": "^3.0.3",
-        "@0x/subproviders": "^2.1.5",
+        "@0x/order-utils": "^3.0.4",
+        "@0x/subproviders": "^2.1.6",
         "@0x/types": "^1.3.0",
         "@0x/typescript-typings": "^3.0.4",
         "@0x/utils": "^2.0.6",
-        "@0x/web3-wrapper": "^3.1.5",
+        "@0x/web3-wrapper": "^3.1.6",
         "ethereum-types": "^1.1.2",
         "lodash": "^4.17.5"
     },
diff --git a/packages/asset-buyer/src/order_providers/standard_relayer_api_order_provider.ts b/packages/asset-buyer/src/order_providers/standard_relayer_api_order_provider.ts
index be1fc55d6..813c9923b 100644
--- a/packages/asset-buyer/src/order_providers/standard_relayer_api_order_provider.ts
+++ b/packages/asset-buyer/src/order_providers/standard_relayer_api_order_provider.ts
@@ -100,6 +100,12 @@ export class StandardRelayerAPIOrderProvider implements OrderProvider {
         } catch (err) {
             throw new Error(AssetBuyerError.StandardRelayerApiError);
         }
-        return _.map(response.records, item => item.assetDataB.assetData);
+        return _.map(response.records, item => {
+            if (item.assetDataA.assetData === takerAssetData) {
+                return item.assetDataB.assetData;
+            } else {
+                return item.assetDataA.assetData;
+            }
+        });
     }
 }