From 3925f12203df791cea5a789d988719353d17a0ab Mon Sep 17 00:00:00 2001
From: Brian Jian Zhao <jian10au@gmail.com>
Date: Wed, 12 Feb 2020 23:18:00 +1100
Subject: [PATCH 1/6] see changes

---
 main.js                                          | 1 +
 ts/components/conversation/CreateGroupDialog.tsx | 1 +
 ts/components/session/SessionModal.tsx           | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/main.js b/main.js
index 2eb625db8..0f57c3956 100644
--- a/main.js
+++ b/main.js
@@ -721,6 +721,7 @@ async function showPermissionsPopupWindow() {
 // Some APIs can only be used after this event occurs.
 let ready = false;
 app.on('ready', async () => {
+  console.log('see me in here');
   const userDataPath = await getRealPath(app.getPath('userData'));
   const installPath = await getRealPath(app.getAppPath());
 
diff --git a/ts/components/conversation/CreateGroupDialog.tsx b/ts/components/conversation/CreateGroupDialog.tsx
index 1daf947db..7495a3778 100644
--- a/ts/components/conversation/CreateGroupDialog.tsx
+++ b/ts/components/conversation/CreateGroupDialog.tsx
@@ -123,6 +123,7 @@ export class CreateGroupDialog extends React.Component<Props, State> {
         <div className="spacer-lg" />
 
         <div className="buttons">
+          <h1>What is going on here</h1>
           <button className="cancel" tabIndex={0} onClick={this.closeDialog}>
             {cancelText}
           </button>
diff --git a/ts/components/session/SessionModal.tsx b/ts/components/session/SessionModal.tsx
index 1d4c45808..4c160b3a3 100644
--- a/ts/components/session/SessionModal.tsx
+++ b/ts/components/session/SessionModal.tsx
@@ -58,6 +58,9 @@ export class SessionModal extends React.PureComponent<Props, State> {
     } = this.props;
     const { isVisible } = this.state;
 
+    console.log(this.props.children, "what is actually in here");
+
+
     return isVisible ? (
       <div className={'session-modal'}>
         {showHeader ? (

From 86d7671b6ecb0990f9486ec579a1068d9c551de5 Mon Sep 17 00:00:00 2001
From: Brian Jian Zhao <jian10au@gmail.com>
Date: Thu, 13 Feb 2020 10:13:32 +1100
Subject: [PATCH 2/6] add padding-bottom to session-model to fix the position
 issue of buttons

---
 stylesheets/_session.scss                        | 2 +-
 ts/components/conversation/CreateGroupDialog.tsx | 2 +-
 ts/components/session/SessionModal.tsx           | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 5781ced1e..cd1e2eb6e 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -684,12 +684,12 @@ label {
   animation: fadein $session-transition-duration;
   z-index: 150;
   min-width: 300px;
-
   box-sizing: border-box;
   max-height: 70vh;
   max-width: 70vw;
   background-color: $session-shade-4;
   border: 1px solid $session-shade-8;
+  padding-bottom: $session-margin-lg;
 
   &__header {
     display: flex;
diff --git a/ts/components/conversation/CreateGroupDialog.tsx b/ts/components/conversation/CreateGroupDialog.tsx
index 7495a3778..b4adefec7 100644
--- a/ts/components/conversation/CreateGroupDialog.tsx
+++ b/ts/components/conversation/CreateGroupDialog.tsx
@@ -123,7 +123,7 @@ export class CreateGroupDialog extends React.Component<Props, State> {
         <div className="spacer-lg" />
 
         <div className="buttons">
-          <h1>What is going on here</h1>
+          <h1 style={{color:'white'}}>What is going on here</h1>
           <button className="cancel" tabIndex={0} onClick={this.closeDialog}>
             {cancelText}
           </button>
diff --git a/ts/components/session/SessionModal.tsx b/ts/components/session/SessionModal.tsx
index 4c160b3a3..1d4c45808 100644
--- a/ts/components/session/SessionModal.tsx
+++ b/ts/components/session/SessionModal.tsx
@@ -58,9 +58,6 @@ export class SessionModal extends React.PureComponent<Props, State> {
     } = this.props;
     const { isVisible } = this.state;
 
-    console.log(this.props.children, "what is actually in here");
-
-
     return isVisible ? (
       <div className={'session-modal'}>
         {showHeader ? (

From 8fc293bc348b59fddd662e20276ab24b8aa0a7f9 Mon Sep 17 00:00:00 2001
From: Brian Jian Zhao <jian10au@gmail.com>
Date: Thu, 13 Feb 2020 13:35:43 +1100
Subject: [PATCH 3/6] change overflow behaviour to auto for
 friend-selection-list

---
 stylesheets/_session.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index cd1e2eb6e..f4ab841cd 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -1424,6 +1424,7 @@ input {
 
 .friend-selection-list {
   width: 40vh;
+  overflow: auto;
 }
 
 .session-beta-disclaimer {

From 8a0e14de40ee7e39c9475dd9edce93b362e04bbc Mon Sep 17 00:00:00 2001
From: Brian Jian Zhao <jian10au@gmail.com>
Date: Thu, 13 Feb 2020 13:44:12 +1100
Subject: [PATCH 4/6] target the change to _mention.scss

---
 stylesheets/_mentions.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stylesheets/_mentions.scss b/stylesheets/_mentions.scss
index 0f8ae10b2..eced5bdac 100644
--- a/stylesheets/_mentions.scss
+++ b/stylesheets/_mentions.scss
@@ -94,7 +94,7 @@
 
 .friend-selection-list {
   max-height: 240px;
-  overflow-y: scroll;
+  overflow-y: auto;
   margin: 4px;
 
   .check-mark {

From 5d6187dfcdde4131eac797c28db2b6c40a733935 Mon Sep 17 00:00:00 2001
From: Brian Jian Zhao <jian10au@gmail.com>
Date: Thu, 13 Feb 2020 13:51:04 +1100
Subject: [PATCH 5/6] ready for merging back to loki repo

---
 stylesheets/_session.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index f4ab841cd..cd1e2eb6e 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -1424,7 +1424,6 @@ input {
 
 .friend-selection-list {
   width: 40vh;
-  overflow: auto;
 }
 
 .session-beta-disclaimer {

From c8a8e3936f22a6d7fafb471a592d6bb01430383f Mon Sep 17 00:00:00 2001
From: Brian Jian Zhao <jian10au@gmail.com>
Date: Thu, 13 Feb 2020 14:00:12 +1100
Subject: [PATCH 6/6] ready for merging back to origin repo

---
 main.js                                          | 1 -
 ts/components/conversation/CreateGroupDialog.tsx | 1 -
 2 files changed, 2 deletions(-)

diff --git a/main.js b/main.js
index 0f57c3956..2eb625db8 100644
--- a/main.js
+++ b/main.js
@@ -721,7 +721,6 @@ async function showPermissionsPopupWindow() {
 // Some APIs can only be used after this event occurs.
 let ready = false;
 app.on('ready', async () => {
-  console.log('see me in here');
   const userDataPath = await getRealPath(app.getPath('userData'));
   const installPath = await getRealPath(app.getAppPath());
 
diff --git a/ts/components/conversation/CreateGroupDialog.tsx b/ts/components/conversation/CreateGroupDialog.tsx
index b4adefec7..1daf947db 100644
--- a/ts/components/conversation/CreateGroupDialog.tsx
+++ b/ts/components/conversation/CreateGroupDialog.tsx
@@ -123,7 +123,6 @@ export class CreateGroupDialog extends React.Component<Props, State> {
         <div className="spacer-lg" />
 
         <div className="buttons">
-          <h1 style={{color:'white'}}>What is going on here</h1>
           <button className="cancel" tabIndex={0} onClick={this.closeDialog}>
             {cancelText}
           </button>