Merge pull request #1524 from Hirobreak/setpin

danieltigse · web-flow · commit 911b7024ce79 · 2020-11-13T12:19:51.000-05:00
fixing account init
diff --git a/electron_app/package.json b/electron_app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.31.0",
+  "version": "0.31.1",
   "author": {
     "name": "Criptext Inc",
     "email": "support@criptext.com",
diff --git a/electron_app/src/windows/index.js b/electron_app/src/windows/index.js
@@ -16,6 +16,7 @@ const aliceManager = require('./../aliceManager');
 const { isFromStore, getSystemLanguage } = require('./windowUtils');
 const { openLaunchWindow } = require('./launch.js');
 const { DEFAULT_PIN } = require('./../utils/const');
+const logger = require('../logger');
 
 const sendAPIevent = async event => {
   await generateEvent({ event, recipientId: myAccount.recipientId });
@@ -45,13 +46,15 @@ const upStepCheckPIN = async () => {
         await deleteEncryptedDatabase();
         upStepNewUser();
       } else {
-        myAccount.initialize(existingAccounts[0]);
+        myAccount.initialize(existingAccounts);
         globalManager.pinData.set({ pinType: 'signin' });
         pinWindow.show();
       }
       return;
     }
-  } catch (error) {}
+  } catch (error) {
+    logger.error(error);
+  }
 
   const pin = await pinWindow.checkPin();
   if (!pin) {
diff --git a/email_composer/package.json b/email_composer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_composer",
-  "version": "0.31.0",
+  "version": "0.31.1",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",
diff --git a/email_loading/package.json b/email_loading/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_loading",
-  "version": "0.31.0",
+  "version": "0.31.1",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",
diff --git a/email_login/package.json b/email_login/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_login",
-  "version": "0.31.0",
+  "version": "0.31.1",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",
diff --git a/email_login/src/components/PanelWrapper.js b/email_login/src/components/PanelWrapper.js
@@ -317,6 +317,7 @@ class PanelWrapper extends Component {
             setPopupContent={this.setPopupContent}
             value={this.state.values.usernameOrEmailAddress}
             onChangeVersion={this.props.onChangeVersion}
+            onGoToChangePassword={this.hangleGoToChangePassword}
           />
         );
       case mode.CHANGEPASSWORD:
diff --git a/email_login/src/images/img-subtitle.svg b/email_login/src/images/img-subtitle.svg
@@ -1,8 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="268" height="48" viewBox="0 0 268 48">
-    <g fill="none" fill-rule="evenodd" transform="translate(-.5 -.62)">
-        <circle cx="215.747" cy="41.193" r="2.687" fill="#0091FF"/>
-        <text fill="#000" font-family="NunitoSans-Bold, Nunito Sans" font-size="30.091" font-weight="bold">
-            <tspan x="41.66" y="48.088">Better Email</tspan>
-        </text>
-    </g>
-</svg>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 217.18 30.78"><defs><style>.cls-1,.cls-2{fill:none;}.cls-1{clip-rule:evenodd;}.cls-3{clip-path:url(#clip-path);}.cls-4{clip-path:url(#clip-path-2);}.cls-5{fill:#0091ff;}.cls-6{clip-path:url(#clip-path-3);}</style><clipPath id="clip-path" transform="translate(-32.94 -15.83)"><path class="cls-1" d="M241.16,41.6a4,4,0,1,0-4-4A4,4,0,0,0,241.16,41.6Z"/></clipPath><clipPath id="clip-path-2" transform="translate(-32.94 -15.83)"><rect class="cls-2" x="-53" y="-286" width="375" height="667"/></clipPath><clipPath id="clip-path-3" transform="translate(-32.94 -15.83)"><rect class="cls-2" x="26" y="10.6" width="211.2" height="36"/></clipPath></defs><title>img_subtitle</title><g class="cls-3"><g class="cls-4"><rect class="cls-5" x="199.26" y="12.86" width="17.92" height="17.92"/></g></g><g class="cls-6"><path d="M52,30.73a6.47,6.47,0,0,1,1.2,4,6.12,6.12,0,0,1-2.32,5.08,10.08,10.08,0,0,1-6.39,1.83H32.94V16.22H44.1A9.92,9.92,0,0,1,50.31,18a5.82,5.82,0,0,1,2.25,4.88,5.8,5.8,0,0,1-1.06,3.49,6.16,6.16,0,0,1-2.93,2.16A6.18,6.18,0,0,1,52,30.73ZM37.48,26.92h5.87q4.78,0,4.78-3.57A3.06,3.06,0,0,0,47,20.69a6.13,6.13,0,0,0-3.6-.87H37.48ZM47.63,37.1a3.32,3.32,0,0,0,1.15-2.8,3.43,3.43,0,0,0-1.17-2.85A5.85,5.85,0,0,0,44,30.52H37.48V38H44A6,6,0,0,0,47.63,37.1Z" transform="translate(-32.94 -15.83)"/><path d="M72.58,33.61h-12a5.47,5.47,0,0,0,1.48,3.64,5.06,5.06,0,0,0,3.6,1.19A8.46,8.46,0,0,0,71,36.56l1.3,3.1a9.54,9.54,0,0,1-3.08,1.62,11.74,11.74,0,0,1-3.72.61,9.33,9.33,0,0,1-6.83-2.45,9,9,0,0,1-2.5-6.69A10.28,10.28,0,0,1,57.24,28a7.92,7.92,0,0,1,3-3.24,8.6,8.6,0,0,1,4.45-1.15,7.33,7.33,0,0,1,5.74,2.34,9.26,9.26,0,0,1,2.11,6.44ZM61.94,27.89a5.63,5.63,0,0,0-1.35,3.31h8.14a5.17,5.17,0,0,0-1.08-3.33,3.56,3.56,0,0,0-2.81-1.13A3.81,3.81,0,0,0,61.94,27.89Z" transform="translate(-32.94 -15.83)"/><path d="M86.69,38.4l-.22,3.35c-.72.07-1.38.11-2,.11q-3.7,0-5.47-1.71a6.82,6.82,0,0,1-1.76-5.1V27.38H73.87V24h3.39V18.74h4.5V24H86.4v3.38H81.76V35q0,3.52,3.27,3.53A13.87,13.87,0,0,0,86.69,38.4Z" transform="translate(-32.94 -15.83)"/><path d="M99.76,38.4l-.22,3.35c-.72.07-1.38.11-2,.11-2.47,0-4.3-.57-5.47-1.71a6.78,6.78,0,0,1-1.76-5.1V27.38H86.94V24h3.39V18.74h4.5V24h4.64v3.38H94.83V35q0,3.52,3.27,3.53A13.87,13.87,0,0,0,99.76,38.4Z" transform="translate(-32.94 -15.83)"/><path d="M117.83,33.61h-12a5.47,5.47,0,0,0,1.48,3.64,5.06,5.06,0,0,0,3.6,1.19,8.5,8.5,0,0,0,5.33-1.88l1.29,3.1a9.54,9.54,0,0,1-3.08,1.62,11.74,11.74,0,0,1-3.72.61,9.29,9.29,0,0,1-6.82-2.45,8.92,8.92,0,0,1-2.51-6.69A10.28,10.28,0,0,1,102.49,28a7.88,7.88,0,0,1,3.05-3.24A8.54,8.54,0,0,1,110,23.57a7.33,7.33,0,0,1,5.74,2.34,9.26,9.26,0,0,1,2.11,6.44Zm-10.64-5.72a5.63,5.63,0,0,0-1.35,3.31H114a5.17,5.17,0,0,0-1.08-3.33,3.56,3.56,0,0,0-2.81-1.13A3.81,3.81,0,0,0,107.19,27.89Z" transform="translate(-32.94 -15.83)"/><path d="M133.09,27.31l-2.63.25Q126,28,126,32.1v9.5h-4.5V24h4.28v3.1c.92-2.12,2.8-3.27,5.66-3.46l1.36-.11Z" transform="translate(-32.94 -15.83)"/><path d="M145.44,41.6V16.22h17V19.9H150v7h11.73v3.64H150v7.41h12.45V41.6Z" transform="translate(-32.94 -15.83)"/><path d="M191.63,25.35q1.47,1.78,1.47,5.45V41.6h-4.5V31a4.93,4.93,0,0,0-.68-2.93,2.58,2.58,0,0,0-2.2-.92,3.41,3.41,0,0,0-2.8,1.23,5.17,5.17,0,0,0-1,3.42V41.6h-4.5V31a5,5,0,0,0-.67-2.93,2.55,2.55,0,0,0-2.21-.92,3.38,3.38,0,0,0-2.77,1.23,5.17,5.17,0,0,0-1,3.42V41.6h-4.5V24h4.39v2.48a5.23,5.23,0,0,1,2.2-2.17,6.66,6.66,0,0,1,3.2-.74c2.66,0,4.43,1.1,5.29,3.31a6,6,0,0,1,2.38-2.43,6.81,6.81,0,0,1,3.45-.88A5.47,5.47,0,0,1,191.63,25.35Z" transform="translate(-32.94 -15.83)"/><path d="M210.74,25.37q1.8,1.8,1.8,5.54V41.6h-4.28V38.9a4.69,4.69,0,0,1-1.93,2.2,5.74,5.74,0,0,1-3,.79,7.06,7.06,0,0,1-3.2-.72,5.69,5.69,0,0,1-2.27-2,5,5,0,0,1-.83-2.81,4.47,4.47,0,0,1,1-3.06,6,6,0,0,1,3.22-1.62,29.83,29.83,0,0,1,6.16-.5h.9v-.83a3.64,3.64,0,0,0-.77-2.59,3.51,3.51,0,0,0-2.58-.79,9.75,9.75,0,0,0-2.93.48,15.73,15.73,0,0,0-3,1.35l-1.26-3.09a13.71,13.71,0,0,1,3.57-1.55,14,14,0,0,1,4-.61Q208.95,23.57,210.74,25.37Zm-3.62,12.08a4.38,4.38,0,0,0,1.14-3.12v-.75h-.65a25.38,25.38,0,0,0-3.74.21,3.67,3.67,0,0,0-1.91.76,1.93,1.93,0,0,0-.58,1.47,2.49,2.49,0,0,0,.79,1.89,2.83,2.83,0,0,0,2,.74A3.84,3.84,0,0,0,207.12,37.45Z" transform="translate(-32.94 -15.83)"/><path d="M216.86,15.83h5v4.43h-5Zm.26,25.77V24h4.5V41.6Z" transform="translate(-32.94 -15.83)"/><path d="M226.26,41.6V16.22h4.5V41.6Z" transform="translate(-32.94 -15.83)"/></g></svg>
diff --git a/email_login/src/new-components/launch.scss b/email_login/src/new-components/launch.scss
@@ -6,10 +6,10 @@
 
   .title-container {
     text-align: center;
-    margin-top: 200px;
+    margin-top: 185px;
 
     > div {
-      background-position: center;
+      background-position: bottom;
       background-repeat: no-repeat;
     }
   }
@@ -21,7 +21,10 @@
 
   .subtitle {
     background-image: url(../#{$_PATH_TO_IMAGES}/img-subtitle.svg);
-    height: 48px;
+    height: 30px;
+    width: 190px;
+    margin: auto;
+    margin-top: 18px;
   }
 
   .buttons-container {
@@ -30,13 +33,14 @@
     height: 95px;
     justify-content: space-between;
     align-items: center;
-    margin-top: 120px;
+    margin-top: 128px;
   }
 
   .version-container {
     color: #8a8a8a;
     text-align: center;
     margin-top: 15px;
+    margin-bottom: 19px;
   }
 }
 
diff --git a/email_mailbox/package.json b/email_mailbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_mailbox",
-  "version": "0.31.0",
+  "version": "0.31.1",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",
diff --git a/email_pin/package.json b/email_pin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_pin",
-  "version": "0.31.0",
+  "version": "0.31.1",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "criptext",`
`3`		`- "version": "0.31.0",`
	`3`	`+ "version": "0.31.1",`
`4`	`4`	`"author": {`
`5`	`5`	`"name": "Criptext Inc",`
`6`	`6`	`"email": "[email protected]",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "email_composer",`
`3`		`- "version": "0.31.0",`
	`3`	`+ "version": "0.31.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "email_loading",`
`3`		`- "version": "0.31.0",`
	`3`	`+ "version": "0.31.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "email_login",`
`3`		`- "version": "0.31.0",`
	`3`	`+ "version": "0.31.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,10 @@`
`6`	`6`
`7`	`7`	`.title-container {`
`8`	`8`	`text-align: center;`
`9`		`- margin-top: 200px;`
	`9`	`+ margin-top: 185px;`
`10`	`10`
`11`	`11`	`> div {`
`12`		`- background-position: center;`
	`12`	`+ background-position: bottom;`
`13`	`13`	`background-repeat: no-repeat;`
`14`	`14`	`}`
`15`	`15`	`}`
`@@ -21,7 +21,10 @@`
`21`	`21`
`22`	`22`	`.subtitle {`
`23`	`23`	`background-image: url(../#{$_PATH_TO_IMAGES}/img-subtitle.svg);`
`24`		`- height: 48px;`
	`24`	`+ height: 30px;`
	`25`	`+ width: 190px;`
	`26`	`+ margin: auto;`
	`27`	`+ margin-top: 18px;`
`25`	`28`	`}`
`26`	`29`
`27`	`30`	`.buttons-container {`
`@@ -30,13 +33,14 @@`
`30`	`33`	`height: 95px;`
`31`	`34`	`justify-content: space-between;`
`32`	`35`	`align-items: center;`
`33`		`- margin-top: 120px;`
	`36`	`+ margin-top: 128px;`
`34`	`37`	`}`
`35`	`38`
`36`	`39`	`.version-container {`
`37`	`40`	`color: #8a8a8a;`
`38`	`41`	`text-align: center;`
`39`	`42`	`margin-top: 15px;`
	`43`	`+ margin-bottom: 19px;`
`40`	`44`	`}`
`41`	`45`	`}`
`42`	`46`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "email_mailbox",`
`3`		`- "version": "0.31.0",`
	`3`	`+ "version": "0.31.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "email_pin",`
`3`		`- "version": "0.31.0",`
	`3`	`+ "version": "0.31.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",`