Commit 904f996f authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Correctly display custom ID, email, and verify time on console user details page.

parent 14f11976
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr
- Correctly display group names on console user details page.
- Do not attempt to navigate to groups from console user details page.
- Correctly update wallet on console user details page.
- Correctly display custom ID, email, and verification time on console user details page.
- Add missing placeholder text to fields on console user details page.

## [2.5.0] - 2019-04-25
### Added
+6 −6

File changed.

Preview size limit exceeded, changes collapsed.

+10 −5
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ class UsersDetails extends Component<Props, State> {
                    disabled
                    key={this.key('facebook_id')}
                    type="text"
                    placeholder="(empty)"
                    name="facebook_id"
                    maxLength="128"
                    defaultValue={account.account.user.facebook_id}
@@ -423,6 +424,7 @@ class UsersDetails extends Component<Props, State> {
                    disabled
                    key={this.key('gamecenter_id')}
                    type="text"
                    placeholder="(empty)"
                    name="gamecenter_id"
                    maxLength="128"
                    defaultValue={account.account.user.gamecenter_id}
@@ -449,6 +451,7 @@ class UsersDetails extends Component<Props, State> {
                    disabled
                    key={this.key('google_id')}
                    type="text"
                    placeholder="(empty)"
                    name="google_id"
                    maxLength="128"
                    defaultValue={account.account.user.google_id}
@@ -475,6 +478,7 @@ class UsersDetails extends Component<Props, State> {
                    disabled
                    key={this.key('steam_id')}
                    type="text"
                    placeholder="(empty)"
                    name="steam_id"
                    maxLength="128"
                    defaultValue={account.account.user.steam_id}
@@ -610,12 +614,12 @@ class UsersDetails extends Component<Props, State> {
                    placeholder="(empty)"
                    name="custom_id"
                    maxLength="128"
                    defaultValue={account.account.user.custom_id}
                    defaultValue={account.account.custom_id}
                  />
                </Control>
                <Control>
                  <Button
                    disabled={!account.account.user.custom_id}
                    disabled={!account.account.custom_id}
                    onClick={this.unlink.bind(this, 'custom')}
                  >Unlink</Button>
                </Control>
@@ -663,14 +667,15 @@ class UsersDetails extends Component<Props, State> {
                    disabled
                    key={this.key('email')}
                    type="text"
                    placeholder="(empty)"
                    name="email"
                    maxLength="255"
                    defaultValue={account.account.user.email}
                    defaultValue={account.account.email}
                  />
                </Control>
                <Control>
                  <Button
                    disabled={!account.account.user.email}
                    disabled={!account.account.email}
                    onClick={this.unlink.bind(this, 'email')}
                  >Unlink</Button>
                </Control>
@@ -690,7 +695,7 @@ class UsersDetails extends Component<Props, State> {
                    key={this.key('verified')}
                    type="text"
                    name="verified"
                    defaultValue={account.account.user.verify_time || 'false'}
                    defaultValue={account.account.verify_time || 'false'}
                  />
                </Control>
              </Field>
+5 −6
Original line number Diff line number Diff line
@@ -51,17 +51,13 @@ export interface UserObject
  location?: string,
  timezone?: string,
  metadata?: string,
  wallet?: string,
  email?: string,
  facebook_id?: string,
  google_id?: string,
  gamecenter_id?: string,
  steam_id?: string,
  custom_id?: string
  edge_count?: number,
  create_time?: string,
  update_time?: string,
  verify_time?: string
  update_time?: string
};

export interface UsersObjectRequest
@@ -81,7 +77,10 @@ export interface AccountObject
{
  user: UserObject,
  wallet?: string,
  devices?: any[]
  devices?: any[],
  custom_id?: string,
  email?: string,
  verify_time?: string
};

export interface ExportObject