+ (Event) Fixed a display issue that showed the nickname of registrants instead of their first name during the registration problem, which could cause confusion as the actual value recorded for the registrant was their first name. (Fixes SparkDevNetwork#6160)

Author: shauncummings

Rock.Blocks/Event/RegistrationEntry.cs

@@ -2199,7 +2199,7 @@ private object GetPersonCurrentFieldValue( RockContext rockContext, Person perso
             switch ( field.PersonFieldType )
             {
                 case RegistrationPersonFieldType.FirstName:
-                    return person.NickName.IsNullOrWhiteSpace() ? person.FirstName : person.NickName;
+                    return person.FirstName;
 
                 case RegistrationPersonFieldType.LastName:
                     return person.LastName;

RockWeb/Blocks/Event/RegistrationEntry.ascx.cs

@@ -2339,7 +2339,7 @@ private void SetRegistrantState( int registrantCount )
                     {
                         registrant.FieldValues.AddOrReplace(
                             field.Id,
-                            new FieldValueObject( field, field.PersonFieldType == RegistrationPersonFieldType.FirstName ? CurrentPerson.NickName : CurrentPerson.LastName ) );
+                            new FieldValueObject( field, field.PersonFieldType == RegistrationPersonFieldType.FirstName ? CurrentPerson.FirstName : CurrentPerson.LastName ) );
                     }
                 }