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

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

1 files changed, 7 insertions, 1 deletions

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;
+            }
+        });
     }
 }