misc waiting list fixes (steemit#1393)

Kryndex · May 1, 2017 · af7eb7c · af7eb7c
1 parent a8e1674
commit af7eb7c
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/app/components/all.scss b/app/components/all.scss
@@ -30,6 +30,7 @@
 @import "./elements/ShareMenu";
 @import "./elements/Author";
 @import "./elements/UserNames";
+@import "./elements/QrKeyView";
 
 // modules
 @import "./modules/Header";

diff --git a/app/components/elements/QrKeyView.jsx b/app/components/elements/QrKeyView.jsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import QRCode from 'react-qr'
-require('./QrKeyView.scss');
 import { translate } from 'app/Translator';
 
 export default ({type, text, isPrivate, onClose}) => {

diff --git a/app/components/pages/CreateAccount.jsx b/app/components/pages/CreateAccount.jsx
@@ -267,7 +267,7 @@ class CreateAccount extends React.Component {
                                 </div>
                             </noscript>
                             {loading && <LoadingIndicator type="circle" />}
-                            <input disabled={submit_btn_disabled} type="submit" className={submit_btn_class} onClick={this.mousePosition} value="Create Account" />
+                            <input disabled={submit_btn_disabled} type="submit" className={submit_btn_class} onClick={this.mousePosition} value="Submit" />
                         </form>
                     </div>
                 </div>

diff --git a/db/models/account.js b/db/models/account.js
@@ -16,7 +16,8 @@ module.exports = function (sequelize, DataTypes) {
         referrer: DataTypes.STRING,
         refcode: DataTypes.STRING,
         remote_ip: DataTypes.STRING,
-        ignored: {type: DataTypes.BOOLEAN}
+        ignored: {type: DataTypes.BOOLEAN},
+        created: {type: DataTypes.BOOLEAN}
     }, {
         tableName: 'accounts',
         createdAt   : 'created_at',

diff --git a/server/api/general.js b/server/api/general.js
@@ -37,7 +37,8 @@ export default function useGeneralApi(app) {
                 posting_key: account.posting_key,
                 memo_key: account.memo_key,
                 remote_ip,
-                referrer: this.session.r
+                referrer: this.session.r,
+                created: false
             })).catch(error => {
                 console.error('!!! Can\'t create account wait model in /accounts api', this.session.uid, error);
         });
@@ -201,7 +202,8 @@ export default function useGeneralApi(app) {
                 posting_key: account.posting_key,
                 memo_key: account.memo_key,
                 remote_ip,
-                referrer: this.session.r
+                referrer: this.session.r,
+                created: true
             })).catch(error => {
                 console.error('!!! Can\'t create account model in /accounts api', this.session.uid, error);
         });

diff --git a/server/app_render.jsx b/server/app_render.jsx
@@ -34,7 +34,7 @@ async function appRender(ctx) {
                     user = await models.User.findOne({
                         attributes: ['name', 'email', 'picture_small'],
                         where: {id: user_id},
-                        include: [{model: models.Account, attributes: ['name', 'ignored']}],
+                        include: [{model: models.Account, attributes: ['name', 'ignored', 'created']}],
                         logging: false
                     });
                     appRender.dbStatus = {ok: true};
@@ -49,7 +49,7 @@ async function appRender(ctx) {
             if (user) {
                 let account = null;
                 for (const a of user.Accounts) {
-                    if (!a.ignored) {
+                    if (!a.ignored && a.created !== false) {
                         account = a.name;
                         break;
                     }

diff --git a/server/sign_up_pages/enter_confirm_email.jsx b/server/sign_up_pages/enter_confirm_email.jsx
@@ -115,7 +115,8 @@ export default function useEnterAndConfirmEmailPages(app) {
                 uid: this.session.uid,
                 name: this.request.query.account,
                 remote_ip: getRemoteIp(this.request.req),
-                sign_up_meta: JSON.stringify(data)
+                sign_up_meta: JSON.stringify(data),
+                account_status: 'waiting'
             });
             this.session.user = user.id;
             yield models.Identity.create({