Merge branch 'main' of github.com:MetaMask/metamask-mobile into feat-…

…header-update
MetaMask · Oct 18, 2024 · e98d68d · e98d68d
2 parents 31072ee + 076fa31
commit e98d68d
Show file tree

Hide file tree

Showing 23 changed files with 2,890 additions and 894 deletions.
diff --git a/app/component-library/components/Form/TextField/foundation/Input/Input.tsx b/app/component-library/components/Form/TextField/foundation/Input/Input.tsx
@@ -21,7 +21,7 @@ const Input: React.FC<InputProps> = ({
  isReadonly = false,
  onBlur,
  onFocus,
- autoFocus = false,
+ autoFocus = true,
  ...props
 }) => {
  const [isFocused, setIsFocused] = useState(autoFocus);
@@ -64,7 +64,7 @@ const Input: React.FC<InputProps> = ({
  {...props}
  style={styles.base}
  editable={!isDisabled && !isReadonly}
- autoFocus
+ autoFocus={autoFocus}
  onBlur={onBlurHandler}
  onFocus={onFocusHandler}
  />

diff --git a/...nent-library/components/Form/TextField/foundation/Input/__snapshots__/Input.test.tsx.snap b/...nent-library/components/Form/TextField/foundation/Input/__snapshots__/Input.test.tsx.snap
@@ -9,7 +9,7 @@ exports[`Input should render correctly 1`] = `
  style={
  {
  "backgroundColor": "#ffffff",
- "borderColor": "transparent",
+ "borderColor": "#0376c9",
  "borderWidth": 1,
  "color": "#141618",
  "fontFamily": "Euclid Circular B",

diff --git a/app/components/UI/Ramp/Views/Settings/ActivationKeyForm.tsx b/app/components/UI/Ramp/Views/Settings/ActivationKeyForm.tsx
@@ -116,6 +116,7 @@ function ActivationKeyForm() {
  returnKeyType={'done'}
  onSubmitEditing={handleSubmit}
  isReadonly={Boolean(key)}
+ autoFocus
  />
  </Row>
 

diff --git a/app/components/UI/Ramp/Views/Settings/__snapshots__/ActivationKeyForm.test.tsx.snap b/app/components/UI/Ramp/Views/Settings/__snapshots__/ActivationKeyForm.test.tsx.snap
@@ -536,7 +536,7 @@ exports[`AddActivationKey renders correctly 1`] = `
  {
  "alignItems": "center",
  "backgroundColor": "#ffffff",
- "borderColor": "#bbc0c5",
+ "borderColor": "#0376c9",
  "borderRadius": 8,
  "borderWidth": 1,
  "flexDirection": "row",

diff --git a/app/components/Views/EditAccountName/EditAccountName.tsx b/app/components/Views/EditAccountName/EditAccountName.tsx
@@ -124,6 +124,7 @@ const EditAccountName = () => {
  value={accountName}
  onChangeText={onChangeName}
  testID={EditAccountNameSelectorIDs.ACCOUNT_NAME_INPUT}
+ autoFocus
  />
  </View>
  <View style={styles.inputContainer}>
@@ -137,6 +138,7 @@ const EditAccountName = () => {
  selectedInternalAccount?.address,
  'mid',
  )}
+ autoFocus
  />
  ) : null}
  </View>

diff --git a/app/components/Views/EditAccountName/__snapshots__/EditAccountName.test.tsx.snap b/app/components/Views/EditAccountName/__snapshots__/EditAccountName.test.tsx.snap
@@ -47,7 +47,7 @@ exports[`EditAccountName should render correctly 1`] = `
  {
  "alignItems": "center",
  "backgroundColor": "#ffffff",
- "borderColor": "#bbc0c5",
+ "borderColor": "#0376c9",
  "borderRadius": 8,
  "borderWidth": 1,
  "flexDirection": "row",
@@ -120,7 +120,7 @@ exports[`EditAccountName should render correctly 1`] = `
  {
  "alignItems": "center",
  "backgroundColor": "#ffffff",
- "borderColor": "#bbc0c5",
+ "borderColor": "#0376c9",
  "borderRadius": 8,
  "borderWidth": 1,
  "flexDirection": "row",