From ba5d8df8581bb39f5eedd0f19baf2544e77fc96a Mon Sep 17 00:00:00 2001
From: Jessica Dembe <jessica.dembe@gsa.gov>
Date: Fri, 30 Sep 2022 09:46:44 -0400
Subject: [PATCH 01/12] do not display "manage phone number" if a user only has
 one phone method

---
 app/views/accounts/_phone.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/accounts/_phone.html.erb b/app/views/accounts/_phone.html.erb
index 2536b162cc7..a9eaf9bb540 100644
--- a/app/views/accounts/_phone.html.erb
+++ b/app/views/accounts/_phone.html.erb
@@ -10,7 +10,7 @@
       <div class="grid-row grid-gap-2">
         <div class="grid-col-fill">
           <%= PhoneFormatter.format(phone_configuration.phone) %>
-          <% if current_user.default_phone_configuration == phone_configuration %>
+          <% if current_user.default_phone_configuration == phone_configuration && MfaContext.new(current_user).phone_configurations.count > 1 %>
             (<%= I18n.t('account.index.default') %>)
           <% end %>
         </div>

From 8d3e2b71a645fca0c233a8f6d4e9021593d2735e Mon Sep 17 00:00:00 2001
From: Jessica Dembe <jessica.dembe@gsa.gov>
Date: Mon, 3 Oct 2022 10:11:48 -0400
Subject: [PATCH 02/12] add method that returns boolean for 1 phone method
 configuered

---
 app/forms/edit_phone_form.rb                             | 4 ++++
 app/views/users/edit_phone/_make_default_number.html.erb | 1 +
 2 files changed, 5 insertions(+)

diff --git a/app/forms/edit_phone_form.rb b/app/forms/edit_phone_form.rb
index f014de1462e..4e3b615fdd4 100644
--- a/app/forms/edit_phone_form.rb
+++ b/app/forms/edit_phone_form.rb
@@ -33,6 +33,10 @@ def default_phone_configuration?
     phone_configuration == user.default_phone_configuration
   end
 
+  def one_phone_configured?
+    user.phone_configurations.count == 1
+  end
+
   private
 
   attr_writer :delivery_preference, :make_default_number
diff --git a/app/views/users/edit_phone/_make_default_number.html.erb b/app/views/users/edit_phone/_make_default_number.html.erb
index 0b68b2faf71..10d27ce5c0a 100644
--- a/app/views/users/edit_phone/_make_default_number.html.erb
+++ b/app/views/users/edit_phone/_make_default_number.html.erb
@@ -11,6 +11,7 @@
           :otp_make_default_number,
           @edit_phone_form.default_phone_configuration?,
           class: 'usa-checkbox__input usa-checkbox__input--bordered',
+          disabled: @edit_phone_form.one_phone_configured?,
         ) %>
     <label
       class="usa-checkbox__label"

From 3c109c716bb150d5a6b5508436dea7408a7d58cb Mon Sep 17 00:00:00 2001
From: Jessica Dembe <jessica.dembe@gsa.gov>
Date: Mon, 3 Oct 2022 12:52:15 -0400
Subject: [PATCH 03/12] add test to reflect change in default text on account
 screen

---
 spec/features/phone/default_phone_selection_spec.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/spec/features/phone/default_phone_selection_spec.rb b/spec/features/phone/default_phone_selection_spec.rb
index 575317f9b13..ed5cef0a79a 100644
--- a/spec/features/phone/default_phone_selection_spec.rb
+++ b/spec/features/phone/default_phone_selection_spec.rb
@@ -20,6 +20,11 @@
           expiration: TwoFactorAuthenticatable::DIRECT_OTP_VALID_FOR_MINUTES,
         )
       end
+
+      it 'does not indicate that it is the default text ' do
+        sign_in_before_2fa(user)
+        expect(page).not_to have_content t('account.index.default')
+      end
     end
 
     context 'when the user creates a new default phone number' do

From 3f09b757cf2042b9e2f74a33c688d87c0ad67cf0 Mon Sep 17 00:00:00 2001
From: Jessica Dembe <jessica.dembe@gsa.gov>
Date: Tue, 4 Oct 2022 14:38:11 -0400
Subject: [PATCH 04/12] add switch to display text when user only has 1 phone
 method set up

---
 spec/features/phone/default_phone_selection_spec.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spec/features/phone/default_phone_selection_spec.rb b/spec/features/phone/default_phone_selection_spec.rb
index ed5cef0a79a..2c6add87705 100644
--- a/spec/features/phone/default_phone_selection_spec.rb
+++ b/spec/features/phone/default_phone_selection_spec.rb
@@ -54,6 +54,12 @@
           expiration: TwoFactorAuthenticatable::DIRECT_OTP_VALID_FOR_MINUTES,
         )
       end
+
+      it 'shows a disabled checkbox' do
+        sign_in_visit_add_phone_path(user, phone_config2)
+
+        expect(rendered).to have_field('two_factor_options_form[selection][]', disabled: true)
+      end
     end
 
     context 'when the user edits exiting phone and sets it as default' do

From d03531a559fdfd7af3c4bfa8b3d9210f28dcade9 Mon Sep 17 00:00:00 2001
From: Jessica Dembe <jessica.dembe@gsa.gov>
Date: Tue, 4 Oct 2022 19:21:09 -0400
Subject: [PATCH 05/12] add logic and text for default number instructions

---
 app/views/users/edit_phone/_make_default_number.html.erb | 9 +++++++++
 config/locales/two_factor_authentication/en.yml          | 7 +++++--
 config/locales/two_factor_authentication/es.yml          | 8 +++++---
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/views/users/edit_phone/_make_default_number.html.erb b/app/views/users/edit_phone/_make_default_number.html.erb
index 10d27ce5c0a..6ab16372cb8 100644
--- a/app/views/users/edit_phone/_make_default_number.html.erb
+++ b/app/views/users/edit_phone/_make_default_number.html.erb
@@ -1,11 +1,20 @@
 <div class="margin-bottom-4">
   <fieldset class="margin-0 padding-0 border-0">
+  <% if @edit_phone_form.one_phone_configured? %>
+    <legend class="margin-bottom-1">
+      <%= t('two_factor_authentication.otp_make_default_number.one_number_title') %>
+    </legend>
+    <p class="margin-top-0 margin-bottom-2" id="otp_make_default_number_instruction">
+      <%= t('two_factor_authentication.otp_make_default_number.one_number_instruction') %>
+    </p>
+  <% else %>
     <legend class="margin-bottom-1">
       <%= t('two_factor_authentication.otp_make_default_number.title') %>
     </legend>
     <p class="margin-top-0 margin-bottom-2" id="otp_make_default_number_instruction">
       <%= t('two_factor_authentication.otp_make_default_number.instruction') %>
     </p>
+  <% end %>
     <%= check_box_tag(
           'edit_phone_form[make_default_number]',
           :otp_make_default_number,
diff --git a/config/locales/two_factor_authentication/en.yml b/config/locales/two_factor_authentication/en.yml
index 73fa14a6e52..24a5d123f76 100644
--- a/config/locales/two_factor_authentication/en.yml
+++ b/config/locales/two_factor_authentication/en.yml
@@ -88,9 +88,12 @@ en:
       voice: Phone call
       voice_unsupported: We are unable to call phone numbers in %{location}.
     otp_make_default_number:
-      instruction: Please check the box below if you want this to be the default phone
-        number you receive text messages or phone calls.
+      instruction: Make this phone number the default number where you receive text
+        message or phone calls.
       label: Default phone number
+      one_number_instruction: You must have more than one phone number added to select
+        a default phone number.
+      one_number_title: This is your default number
       title: Make this your default phone number?
     personal_key_fallback:
       question: Don’t have your personal key?
diff --git a/config/locales/two_factor_authentication/es.yml b/config/locales/two_factor_authentication/es.yml
index 120bf3596c9..7ff3718ed30 100644
--- a/config/locales/two_factor_authentication/es.yml
+++ b/config/locales/two_factor_authentication/es.yml
@@ -95,10 +95,12 @@ es:
       voice: Llamada telefónica
       voice_unsupported: No podemos llamar a números de teléfono en %{location}.
     otp_make_default_number:
-      instruction: Marque la casilla a continuación si desea que este sea el teléfono
-        predeterminado número que recibe mensajes de texto o llamadas
-        telefónicas.
+      instruction: Establece este número de teléfono como predeterminado para que
+        recibas en él mensajes de texto o llamadas telefónicas.
       label: Número de teléfono predeterminado
+      one_number_instruction: Debes tener más de un número de teléfono agregado para
+        seleccionar un número de teléfono predeterminado.
+      one_number_title: Este es tu número predeterminado
       title: '¿Es este tu número de teléfono predeterminado?'
     personal_key_fallback:
       question: '¿No tiene su clave personal?'

From be97890eed82d854f176956f75b2eb2683c227c8 Mon Sep 17 00:00:00 2001
From: Jessica Dembe <jessica.dembe@gsa.gov>
Date: Wed, 5 Oct 2022 14:58:19 -0400
Subject: [PATCH 06/12] add and edit supporting tests

changelog: Improvements, UX, disable checkbox when only one phone number is set
---
 .../features/phone/default_phone_selection_spec.rb |  8 +-------
 spec/features/phone/edit_phone_spec.rb             | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/spec/features/phone/default_phone_selection_spec.rb b/spec/features/phone/default_phone_selection_spec.rb
index 2c6add87705..0061da6534a 100644
--- a/spec/features/phone/default_phone_selection_spec.rb
+++ b/spec/features/phone/default_phone_selection_spec.rb
@@ -21,7 +21,7 @@
         )
       end
 
-      it 'does not indicate that it is the default text ' do
+      it 'does not indicate that it is the default number on the account page ' do
         sign_in_before_2fa(user)
         expect(page).not_to have_content t('account.index.default')
       end
@@ -54,12 +54,6 @@
           expiration: TwoFactorAuthenticatable::DIRECT_OTP_VALID_FOR_MINUTES,
         )
       end
-
-      it 'shows a disabled checkbox' do
-        sign_in_visit_add_phone_path(user, phone_config2)
-
-        expect(rendered).to have_field('two_factor_options_form[selection][]', disabled: true)
-      end
     end
 
     context 'when the user edits exiting phone and sets it as default' do
diff --git a/spec/features/phone/edit_phone_spec.rb b/spec/features/phone/edit_phone_spec.rb
index 80e30d9cd26..1605965d021 100644
--- a/spec/features/phone/edit_phone_spec.rb
+++ b/spec/features/phone/edit_phone_spec.rb
@@ -12,6 +12,9 @@
     expect(current_path).to eq(manage_phone_path(id: phone_configuration.id))
   end
 
+  it 'allows a user to select a default number' do
+  end
+
   it "does not allow a user to edit another user's phone number" do
     user = create(:user, :signed_up)
     sign_in_and_2fa_user(user)
@@ -20,4 +23,15 @@
 
     expect(page).to have_content('The page you were looking for doesn’t exist')
   end
+
+  context "with only one phone number" do
+    it "does not allow you to check default phone number if only one number is set up" do
+      user = create(:user, :signed_up)
+      phone_configuration = user.phone_configurations.first
+      sign_in_and_2fa_user(user)
+  
+      visit(manage_phone_path(id: phone_configuration.id))
+      expect(page).to have_field('edit_phone_form[make_default_number]', disabled: true)
+    end
+  end
 end

From e98bb56c605ae7c1eb082784c6815e9755331af2 Mon Sep 17 00:00:00 2001
From: Jessica Dembe <jessica.dembe@gsa.gov>
Date: Wed, 5 Oct 2022 16:07:12 -0400
Subject: [PATCH 07/12] remove unused code

---
 spec/features/phone/edit_phone_spec.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/spec/features/phone/edit_phone_spec.rb b/spec/features/phone/edit_phone_spec.rb
index 1605965d021..735b4f70033 100644
--- a/spec/features/phone/edit_phone_spec.rb
+++ b/spec/features/phone/edit_phone_spec.rb
@@ -12,9 +12,6 @@
     expect(current_path).to eq(manage_phone_path(id: phone_configuration.id))
   end
 
-  it 'allows a user to select a default number' do
-  end
-
   it "does not allow a user to edit another user's phone number" do
     user = create(:user, :signed_up)
     sign_in_and_2fa_user(user)

From df9bf81d8860a1cb709ffe819ae1e905021fdf10 Mon Sep 17 00:00:00 2001
From: Jessica Dembe <jessica.dembe@gsa.gov>
Date: Wed, 5 Oct 2022 16:45:12 -0400
Subject: [PATCH 08/12] add missing french keys

---
 config/locales/two_factor_authentication/fr.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/locales/two_factor_authentication/fr.yml b/config/locales/two_factor_authentication/fr.yml
index ed826d49d4d..90486aacf94 100644
--- a/config/locales/two_factor_authentication/fr.yml
+++ b/config/locales/two_factor_authentication/fr.yml
@@ -99,10 +99,12 @@ fr:
       voice_unsupported: Il nous est impossible d’appeler des numéros de téléphone
         dans le %{location}.
     otp_make_default_number:
-      instruction: Veuillez cocher la case ci-dessous si vous voulez que ce soit le
-        téléphone par défaut. numéro que vous recevez des messages texte ou des
-        appels téléphoniques.
+      instruction: Faites de ce numéro de téléphone le numéro par défaut où vous
+        recevez des messages texte ou des appels téléphoniques.
       label: Numéro de téléphone par défaut
+      one_number_instruction: Vous devez avoir ajouté plus d’un numéro de téléphone
+        pour pouvoir sélectionner un numéro de téléphone par défaut.
+      one_number_title: Il s’agit de votre numéro par défaut
       title: Faites-en votre numéro de téléphone par défaut?
     personal_key_fallback:
       question: Vous n’avez pas votre clé personnelle?

From 29eb8b75a35f663b45cb7d6abfa4a17ec0379ff6 Mon Sep 17 00:00:00 2001
From: Jessica Dembe <jessica.dembe@gsa.gov>
Date: Wed, 5 Oct 2022 16:49:00 -0400
Subject: [PATCH 09/12] address lint errors

---
 spec/features/phone/edit_phone_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/features/phone/edit_phone_spec.rb b/spec/features/phone/edit_phone_spec.rb
index 735b4f70033..a514e01c848 100644
--- a/spec/features/phone/edit_phone_spec.rb
+++ b/spec/features/phone/edit_phone_spec.rb
@@ -21,12 +21,12 @@
     expect(page).to have_content('The page you were looking for doesn’t exist')
   end
 
-  context "with only one phone number" do
-    it "does not allow you to check default phone number if only one number is set up" do
+  context 'with only one phone number' do
+    it 'does not allow you to check default phone number if only one number is set up' do
       user = create(:user, :signed_up)
       phone_configuration = user.phone_configurations.first
       sign_in_and_2fa_user(user)
-  
+
       visit(manage_phone_path(id: phone_configuration.id))
       expect(page).to have_field('edit_phone_form[make_default_number]', disabled: true)
     end

From 32efa099f9cbaad5dcf80a439d767efde3d55e9d Mon Sep 17 00:00:00 2001
From: Jessica Dembe <jessica.dembe@gsa.gov>
Date: Thu, 6 Oct 2022 13:11:40 -0400
Subject: [PATCH 10/12] Address PR comments-edit text and re-work test

---
 .../edit_phone/_make_default_number.html.erb  | 23 +++++++++----------
 spec/features/phone/edit_phone_spec.rb        |  5 +++-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/views/users/edit_phone/_make_default_number.html.erb b/app/views/users/edit_phone/_make_default_number.html.erb
index 6ab16372cb8..1f553071e31 100644
--- a/app/views/users/edit_phone/_make_default_number.html.erb
+++ b/app/views/users/edit_phone/_make_default_number.html.erb
@@ -1,20 +1,19 @@
 <div class="margin-bottom-4">
   <fieldset class="margin-0 padding-0 border-0">
-  <% if @edit_phone_form.one_phone_configured? %>
     <legend class="margin-bottom-1">
-      <%= t('two_factor_authentication.otp_make_default_number.one_number_title') %>
+      <% if @edit_phone_form.one_phone_configured? %>
+        <%= t('two_factor_authentication.otp_make_default_number.one_number_title') %>
+      <% else %>
+        <%= t('two_factor_authentication.otp_make_default_number.title') %>
+      <% end %>
     </legend>
-    <p class="margin-top-0 margin-bottom-2" id="otp_make_default_number_instruction">
-      <%= t('two_factor_authentication.otp_make_default_number.one_number_instruction') %>
+    <p class="margin-top-0 margin-bottom-2">
+      <% if @edit_phone_form.one_phone_configured? %>
+        <%= t('two_factor_authentication.otp_make_default_number.one_number_instruction') %>
+      <% else %>
+        <%= t('two_factor_authentication.otp_make_default_number.instruction') %>
+      <% end %>
     </p>
-  <% else %>
-    <legend class="margin-bottom-1">
-      <%= t('two_factor_authentication.otp_make_default_number.title') %>
-    </legend>
-    <p class="margin-top-0 margin-bottom-2" id="otp_make_default_number_instruction">
-      <%= t('two_factor_authentication.otp_make_default_number.instruction') %>
-    </p>
-  <% end %>
     <%= check_box_tag(
           'edit_phone_form[make_default_number]',
           :otp_make_default_number,
diff --git a/spec/features/phone/edit_phone_spec.rb b/spec/features/phone/edit_phone_spec.rb
index a514e01c848..d5fdc9ec499 100644
--- a/spec/features/phone/edit_phone_spec.rb
+++ b/spec/features/phone/edit_phone_spec.rb
@@ -28,7 +28,10 @@
       sign_in_and_2fa_user(user)
 
       visit(manage_phone_path(id: phone_configuration.id))
-      expect(page).to have_field('edit_phone_form[make_default_number]', disabled: true)
+      expect(page).to have_field(
+        t('two_factor_authentication.otp_make_default_number.label'),
+        disabled: true,
+      )
     end
   end
 end

From 72bccd2207564ff67897554f46307143ab9019ca Mon Sep 17 00:00:00 2001
From: Jessica Dembe <jessica.dembe@gsa.gov>
Date: Fri, 7 Oct 2022 15:25:49 -0400
Subject: [PATCH 11/12] write a test to test one_phone_configuration method

---
 spec/forms/edit_phone_form_spec.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/spec/forms/edit_phone_form_spec.rb b/spec/forms/edit_phone_form_spec.rb
index 156d94eec04..cd0c5292028 100644
--- a/spec/forms/edit_phone_form_spec.rb
+++ b/spec/forms/edit_phone_form_spec.rb
@@ -107,4 +107,13 @@
       end
     end
   end
+
+  describe 'user has one number' do
+    let(:user) { create(:user, :signed_up) }
+    let(:phone_configuration) { user.phone_configurations.first }
+
+    it 'recognizes it as the only method set up' do
+      expect(user.default_phone_configuration).to eq(phone_configuration)
+    end
+  end
 end

From ddaee101bc1cbe00eeb20f7a9c5d26167b18ff0a Mon Sep 17 00:00:00 2001
From: Jessica Dembe <jessica.dembe@gsa.gov>
Date: Wed, 12 Oct 2022 12:32:43 -0400
Subject: [PATCH 12/12] fix test for edit form spec

---
 spec/forms/edit_phone_form_spec.rb | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/spec/forms/edit_phone_form_spec.rb b/spec/forms/edit_phone_form_spec.rb
index cd0c5292028..6cf09f75093 100644
--- a/spec/forms/edit_phone_form_spec.rb
+++ b/spec/forms/edit_phone_form_spec.rb
@@ -11,7 +11,7 @@
     }
   end
 
-  subject { described_class.new(user, phone_configuration) }
+  subject { EditPhoneForm.new(user, phone_configuration) }
 
   describe '#submit' do
     context 'when delivery_preference is not voice or sms' do
@@ -108,12 +108,24 @@
     end
   end
 
-  describe 'user has one number' do
-    let(:user) { create(:user, :signed_up) }
-    let(:phone_configuration) { user.phone_configurations.first }
+  describe '#one_phone_configured?' do
+    context 'when editing a form with only one number set up' do
+      let(:user) { create(:user, :signed_up) }
+      let(:phone_configuration) { user.phone_configurations.first }
 
-    it 'recognizes it as the only method set up' do
-      expect(user.default_phone_configuration).to eq(phone_configuration)
+      it 'recognizes it as the only method set up' do
+        expect(subject.one_phone_configured?).to eq(true)
+      end
+    end
+
+    context 'when editing a form with multiple numbers set up' do
+      before do
+        create(:phone_configuration, user: user, made_default_at: Time.zone.now)
+      end
+
+      it 'recognizes that there are multiple phone methods set up' do
+        expect(user.phone_configurations.count).to eq(2)
+      end
     end
   end
 end