[Payment Request] keyboardType, autoCapitalizationType, etc for text fields

ios/chrome/browser/ui/settings/autofill_profile_edit_collection_view_controller.mm

Index: ios/chrome/browser/ui/settings/autofill_profile_edit_collection_view_controller.mm
diff --git a/ios/chrome/browser/ui/settings/autofill_profile_edit_collection_view_controller.mm b/ios/chrome/browser/ui/settings/autofill_profile_edit_collection_view_controller.mm
index 86adb764ec43655c13e2e655d393ba5b6f3487a3..1c7c3b3db68585fb78cf08af32487d12e4df9f18 100644
--- a/ios/chrome/browser/ui/settings/autofill_profile_edit_collection_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/autofill_profile_edit_collection_view_controller.mm
@@ -63,7 +63,7 @@ static const AutofillFieldDisplayInfo kFieldsToDisplay[] = {
     {autofill::ADDRESS_HOME_STATE, IDS_IOS_AUTOFILL_STATE, UIReturnKeyNext,
      UIKeyboardTypeDefault, UITextAutocapitalizationTypeSentences},
     {autofill::ADDRESS_HOME_ZIP, IDS_IOS_AUTOFILL_ZIP, UIReturnKeyNext,
-     UIKeyboardTypeNumberPad, UITextAutocapitalizationTypeSentences},
+     UIKeyboardTypeDefault, UITextAutocapitalizationTypeAllCharacters},
     {autofill::ADDRESS_HOME_COUNTRY, IDS_IOS_AUTOFILL_COUNTRY, UIReturnKeyNext,
      UIKeyboardTypeDefault, UITextAutocapitalizationTypeSentences},
     {autofill::PHONE_HOME_WHOLE_NUMBER, IDS_IOS_AUTOFILL_PHONE, UIReturnKeyNext,
@@ -187,6 +187,9 @@ static const AutofillFieldDisplayInfo kFieldsToDisplay[] = {
         autofill::AutofillType(field.autofillType), locale));
     item.autofillUIType = AutofillUITypeFromAutofillType(field.autofillType);
     item.textFieldEnabled = self.editor.editing;
+    item.autoCapitalizationType = field.autoCapitalizationType;
+    item.returnKeyType = field.returnKeyType;
+    item.keyboardType = field.keyboardType;
     [model addItem:item toSectionWithIdentifier:SectionIdentifierFields];
   }
 }
@@ -215,13 +218,7 @@ static const AutofillFieldDisplayInfo kFieldsToDisplay[] = {
 
   AutofillEditCell* textFieldCell =
       base::mac::ObjCCastStrict<AutofillEditCell>(cell);
-  NSUInteger index =
-      [self.collectionViewModel indexInItemTypeForIndexPath:indexPath];
-  const AutofillFieldDisplayInfo& field = kFieldsToDisplay[index];
   textFieldCell.accessibilityIdentifier = textFieldCell.textLabel.text;
-  textFieldCell.textField.autocapitalizationType = field.autoCapitalizationType;
-  textFieldCell.textField.returnKeyType = field.returnKeyType;
-  textFieldCell.textField.keyboardType = field.keyboardType;
   textFieldCell.textField.delegate = self;
   return textFieldCell;
 }