Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/connect/sra-api-v2

3 files changed, 16 insertions, 4 deletions

diff --git a/packages/website/ts/components/onboarding/intro_onboarding_step.tsx b/packages/website/ts/components/onboarding/intro_onboarding_step.tsx
index 3a27b6854..f9ced7315 100644
--- a/packages/website/ts/components/onboarding/intro_onboarding_step.tsx
+++ b/packages/website/ts/components/onboarding/intro_onboarding_step.tsx
@@ -20,7 +20,9 @@ export const IntroOnboardingStep: React.StatelessComponent<IntroOnboardingStepPr
                 <Text> Wrap ETH </Text>
             </div>
             <div className="flex flex-column items-center">
-                <Image src="/images/fake_toggle.svg" height="50px" width="50px" />
+                <Container marginBottom="9px">
+                    <Image src="/images/lock_icon.svg" height="35px" width="35x" />
+                </Container>
                 <Text> Unlock tokens </Text>
             </div>
         </Container>
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index aef4d0df9..519e4be5e 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -82,7 +82,7 @@ const teamRow3: ProfileInfo[] = [
         name: 'Brandon Millman',
         title: 'Senior Engineer',
         description: `Full-stack engineer. Previously senior software engineer at \
-                      Twitter. Electrical and Computer Engineering at Duke.`,
+                      Twitter. Computer Science and Electrical Engineering at Duke.`,
         image: '/images/team/brandon.png',
         linkedIn: 'https://www.linkedin.com/in/brandon-millman-b093a022/',
         github: 'https://github.com/BMillman19',
@@ -199,6 +199,13 @@ const teamRow7: ProfileInfo[] = [
         image: 'images/team/clay.png',
         linkedIn: 'https://www.linkedin.com/in/robbinsclay/',
     },
+    {
+        name: 'Matt Taylor',
+        title: 'Marketing Lead',
+        description: `Growth & Marketing. Previously marketing at Abra and Square. Economics and Philosophy at Claremont McKenna College.`,
+        image: 'images/team/matt.jpg',
+        linkedIn: 'https://www.linkedin.com/in/mattytay/',
+    },
 ];
 
 const advisors: ProfileInfo[] = [
diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts
index 32b07473c..39bbd404c 100644
--- a/packages/website/ts/utils/utils.ts
+++ b/packages/website/ts/utils/utils.ts
@@ -247,9 +247,12 @@ export const utils = {
         } = {
             [ExchangeContractErrs.OrderFillExpired]: 'This order has expired',
             [ExchangeContractErrs.OrderCancelExpired]: 'This order has expired',
-            [ExchangeContractErrs.OrderCancelled]: 'This order has been cancelled',
+            [ExchangeContractErrs.OrderCancelAmountZero]: "Order cancel amount can't be 0",
+            [ExchangeContractErrs.OrderAlreadyCancelledOrFilled]:
+                'This order has already been completely filled or cancelled',
             [ExchangeContractErrs.OrderFillAmountZero]: "Order fill amount can't be 0",
-            [ExchangeContractErrs.OrderRemainingFillAmountZero]: 'This order has already been completely filled',
+            [ExchangeContractErrs.OrderRemainingFillAmountZero]:
+                'This order has already been completely filled or cancelled',
             [ExchangeContractErrs.OrderFillRoundingError]:
                 'Rounding error will occur when filling this order. Please try filling a different amount.',
             [ExchangeContractErrs.InsufficientTakerBalance]: