merge v2-prototype

4 files changed, 19 insertions, 12 deletions

diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index 5bb5d06a9..33581c938 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -99,7 +99,7 @@ const teamRow3: ProfileInfo[] = [
     },
     {
         name: 'Jacob Evans',
-        title: 'Blockchain Engineer',
+        title: 'Ecosystem Engineer',
         description: `Previously software engineer at Qantas and RSA Security.`,
         image: '/images/team/jacob.jpg',
         linkedIn: 'https://www.linkedin.com/in/dekzter/',
@@ -174,14 +174,21 @@ const teamRow6: ProfileInfo[] = [
         linkedIn: 'https://www.linkedin.com/in/stephenalexbrowne/',
         github: 'http://github.com/albrow',
     },
-    // {
-    //     name: 'Chris Kalani',
-    //     title: 'Director of Design',
-    //     description: `Previously founded Wake (acquired by InVision). Early Facebook product designer.`,
-    //     image: 'images/team/chris.png',
-    //     linkedIn: 'https://www.linkedin.com/in/chriskalani/',
-    //     github: 'https://github.com/chriskalani',
-    // },
+    {
+        name: 'Peter Zeitz',
+        title: 'Research Fellow',
+        description: `Researching decentralized governance. Previously Assistant Professor of Economics at National University of Singapore Business School. PhD in Economics at UCLA.`,
+        image: 'images/team/peter.jpg',
+        linkedIn: 'https://www.linkedin.com/in/peter-z-7b9595163/',
+    },
+    {
+        name: 'Chris Kalani',
+        title: 'Director of Design',
+        description: `Previously founded Wake (acquired by InVision). Early Facebook product designer.`,
+        image: 'images/team/chris.png',
+        linkedIn: 'https://www.linkedin.com/in/chriskalani/',
+        github: 'https://github.com/chriskalani',
+    },
 ];
 
 const advisors: ProfileInfo[] = [
diff --git a/packages/website/ts/pages/jobs/jobs.tsx b/packages/website/ts/pages/jobs/jobs.tsx
index 314669ee9..38cefa832 100644
--- a/packages/website/ts/pages/jobs/jobs.tsx
+++ b/packages/website/ts/pages/jobs/jobs.tsx
@@ -33,7 +33,7 @@ export interface JobsState {}
 
 export class Jobs extends React.Component<JobsProps, JobsState> {
     // TODO: consolidate this small screen scaffolding into one place (its being used in portal and docs as well)
-    private _throttledScreenWidthUpdate: () => void;
+    private readonly _throttledScreenWidthUpdate: () => void;
     public constructor(props: JobsProps) {
         super(props);
         this._throttledScreenWidthUpdate = _.throttle(this._updateScreenWidth.bind(this), THROTTLE_TIMEOUT);
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index b2cf4d979..2a51ee3c0 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -171,7 +171,7 @@ interface LandingState {
 }
 
 export class Landing extends React.Component<LandingProps, LandingState> {
-    private _throttledScreenWidthUpdate: () => void;
+    private readonly _throttledScreenWidthUpdate: () => void;
     constructor(props: LandingProps) {
         super(props);
         this.state = {
diff --git a/packages/website/ts/pages/wiki/wiki.tsx b/packages/website/ts/pages/wiki/wiki.tsx
index 9659900be..55f532b11 100644
--- a/packages/website/ts/pages/wiki/wiki.tsx
+++ b/packages/website/ts/pages/wiki/wiki.tsx
@@ -205,7 +205,7 @@ export class Wiki extends React.Component<WikiProps, WikiState> {
                         articlesBySection,
                     },
                     async () => {
-                        await utils.onPageLoadAsync();
+                        await utils.onPageLoadPromise;
                         const hash = this.props.location.hash.slice(1);
                         sharedUtils.scrollToHash(hash, sharedConstants.SCROLL_CONTAINER_ID);
                     },