Merge pull request #6665 from alphagov/22Feb-eta-non-visa-national-co…

…untries

Add 6 more countries to both the ETA and NVN group

app/flows/check_uk_visa_flow.rb

@@ -159,7 +159,6 @@ def define
           if calculator.passport_country_is_taiwan?
             outcome :outcome_transit_taiwan_through_border_control
           elsif calculator.passport_country_in_visa_national_list? ||
-              calculator.passport_country_in_electronic_visa_waiver_list? ||
               calculator.travel_document?
             outcome :outcome_transit_leaving_airport
           elsif calculator.passport_country_in_direct_airside_transit_visa_list?
@@ -200,8 +199,6 @@ def define
           if calculator.study_visit?
             if calculator.passport_country_requires_electronic_travel_authorisation?
               outcome :outcome_study_electronic_travel_authorisation
-            elsif calculator.passport_country_in_electronic_visa_waiver_list?
-              outcome :outcome_study_waiver
             elsif calculator.passport_country_is_taiwan?
               outcome :outcome_study_waiver_taiwan
             elsif calculator.passport_country_in_direct_airside_transit_visa_list? ||
@@ -214,8 +211,6 @@ def define
           elsif calculator.work_visit?
             if calculator.passport_country_requires_electronic_travel_authorisation?
               outcome :outcome_work_electronic_travel_authorisation
-            elsif calculator.passport_country_in_electronic_visa_waiver_list?
-              outcome :outcome_work_waiver
             elsif (calculator.passport_country_in_british_overseas_territories_list? ||
                 calculator.passport_country_is_taiwan? ||
                 calculator.passport_country_in_non_visa_national_list? ||
@@ -296,7 +291,6 @@ def define
     outcome :outcome_marriage_nvn
     outcome :outcome_marriage_taiwan
     outcome :outcome_marriage_visa_nat_direct_airside_transit_visa
-    outcome :outcome_marriage_electronic_visa_waiver
     outcome :outcome_medical_n
     outcome :outcome_medical_y
     outcome :outcome_no_visa_needed
@@ -306,12 +300,10 @@ def define
     outcome :outcome_partner_family_eea_n
     outcome :outcome_school_n
     outcome :outcome_school_electronic_travel_authorisation
-    outcome :outcome_school_waiver
     outcome :outcome_school_y
     outcome :outcome_standard_visitor_visa
     outcome :outcome_study_m
     outcome :outcome_study_electronic_travel_authorisation
-    outcome :outcome_study_waiver
     outcome :outcome_study_waiver_taiwan
     outcome :outcome_study_no_visa_needed
     outcome :outcome_study_y
@@ -327,12 +319,10 @@ def define
     outcome :outcome_tourism_visa_partner
     outcome :outcome_medical_electronic_travel_authorisation
     outcome :outcome_tourism_electronic_travel_authorisation
-    outcome :outcome_electronic_visa_waiver
     outcome :outcome_visit_waiver_taiwan
     outcome :outcome_work_m
     outcome :outcome_work_n
     outcome :outcome_work_electronic_travel_authorisation
-    outcome :outcome_work_waiver
     outcome :outcome_work_y
   end
 
@@ -353,8 +343,6 @@ def travel_response_next_route(node)
       if calculator.school_visit?
         if calculator.passport_country_requires_electronic_travel_authorisation?
           next outcome(:outcome_school_electronic_travel_authorisation)
-        elsif calculator.passport_country_in_electronic_visa_waiver_list?
-          next outcome(:outcome_school_waiver)
         elsif calculator.passport_country_is_taiwan?
           next outcome(:outcome_study_waiver_taiwan)
         elsif calculator.passport_country_in_non_visa_national_list? || calculator.passport_country_in_british_overseas_territories_list? || calculator.passport_country_in_eea?
@@ -367,8 +355,6 @@ def travel_response_next_route(node)
       if calculator.medical_visit?
         if calculator.passport_country_requires_electronic_travel_authorisation?
           next outcome(:outcome_medical_electronic_travel_authorisation)
-        elsif calculator.passport_country_in_electronic_visa_waiver_list?
-          next outcome(:outcome_electronic_visa_waiver)
         elsif calculator.passport_country_is_taiwan?
           next outcome(:outcome_visit_waiver_taiwan)
         elsif (calculator.passport_country_in_non_visa_national_list? ||
@@ -384,8 +370,6 @@ def travel_response_next_route(node)
       if calculator.tourism_visit?
         if calculator.passport_country_requires_electronic_travel_authorisation?
           next outcome(:outcome_tourism_electronic_travel_authorisation)
-        elsif calculator.passport_country_in_electronic_visa_waiver_list?
-          next outcome(:outcome_electronic_visa_waiver)
         elsif calculator.passport_country_is_taiwan?
           next outcome(:outcome_visit_waiver_taiwan)
         elsif (calculator.passport_country_in_non_visa_national_list? ||
@@ -401,8 +385,6 @@ def travel_response_next_route(node)
       if calculator.marriage_visit?
         if calculator.passport_country_in_eea? || calculator.passport_country_in_non_visa_national_list? || calculator.passport_country_in_british_overseas_territories_list?
           next outcome(:outcome_marriage_nvn)
-        elsif calculator.passport_country_in_electronic_visa_waiver_list?
-          next outcome(:outcome_marriage_electronic_visa_waiver)
         elsif calculator.passport_country_is_taiwan?
           next outcome(:outcome_marriage_taiwan)
         elsif calculator.passport_country_in_direct_airside_transit_visa_list? || calculator.passport_country_in_visa_national_list?

app/flows/check_uk_visa_flow/outcomes/outcome_medical_y.erb

@@ -5,10 +5,6 @@
 <% govspeak_for :body do %>
   You should apply for a [Standard Visitor visa](/standard-visitor).
 
-  <% if calculator.electronic_travel_authorisation_warning_notice_required?  %>
-    <%= render partial: 'electronic_travel_authorisation_advice'%>
-  <% end %>
-
   <%= render partial: 'stateless_or_refugee', locals: {calculator: calculator} %>
 
   <%= render partial: 'estonia_or_latvia', locals: {calculator: calculator} %>

app/flows/check_uk_visa_flow/outcomes/outcome_no_visa_needed.erb

@@ -9,16 +9,6 @@
 
 <% govspeak_for :body do %>
 
-  <% if calculator.electronic_travel_authorisation_warning_notice_required? && Time.now < Time.new(2024, 02, 22)%>
-
-      <% if calculator.passport_country_is_jordan? %>
-      If you're travelling on or after 22 February 2024, you'll need to apply for an [electronic travel authorisation (ETA)](/guidance/apply-for-an-electronic-travel-authorisation-eta).
-      <% else %>
-      If you're travelling on or after 22 February 2024, you'll need to apply for an [electronic travel authorisation (ETA)](/guidance/apply-for-an-electronic-travel-authorisation-eta).
-      <% end %>
-
-  <% end %>
-
   <%if calculator.passport_country_requires_electronic_travel_authorisation? %>
     [Apply for an (ETA)](/guidance/apply-for-an-electronic-travel-authorisation-eta).
   <% end %>

app/flows/check_uk_visa_flow/outcomes/outcome_school_y.erb

@@ -11,9 +11,5 @@
 
   If they’re 12 or over, you can apply for a [Standard Visitor visa](/standard-visitor) to visit them for up to 6 months.
 
-  <% if calculator.electronic_travel_authorisation_warning_notice_required?  %>
-    <%= render partial: 'electronic_travel_authorisation_advice'%>
-  <% end %>
-
   <%= render partial: 'stateless_or_refugee', locals: {calculator: calculator} %>
 <% end %>

app/flows/check_uk_visa_flow/outcomes/outcome_standard_visitor_visa.erb

@@ -12,8 +12,4 @@
   <% end %>
 
   <%= render partial: 'stateless_or_refugee', locals: {calculator: calculator} %>
-
-  <% if calculator.electronic_travel_authorisation_warning_notice_required?  %>
-    <%= render partial: 'electronic_travel_authorisation_advice'%>
-  <% end %>
 <% end %>

app/flows/check_uk_visa_flow/outcomes/outcome_study_m.erb

@@ -6,8 +6,4 @@
   <%= render partial: 'stateless_or_refugee', locals: {calculator: calculator} %>
 
   Apply for a [Standard Visitor visa](/standard-visitor) if you're studying for 6 months or less.
-
-  <% if calculator.electronic_travel_authorisation_warning_notice_required?  %>
-    <%= render partial: 'electronic_travel_authorisation_advice'%>
-  <% end %>
 <% end %>

app/flows/check_uk_visa_flow/outcomes/outcome_tourism_visa_partner.erb

@@ -5,10 +5,6 @@
 <% govspeak_for :body do %>
   In most cases, you must apply for a [Standard Visitor visa](/standard-visitor).
 
-  <% if calculator.electronic_travel_authorisation_warning_notice_required?  %>
-    <%= render partial: 'electronic_travel_authorisation_advice'%>
-  <% end %>
-
   ##When you might not need a visa
 
   You may be able to apply for a free [family permit](/family-permit) if your partner or family member is from the EU, Switzerland, Norway, Iceland or Liechtenstein. They must have been living in the UK before by 31 December 2020.

app/flows/check_uk_visa_flow/outcomes/outcome_transit_leaving_airport.erb

@@ -1,25 +1,9 @@
 <% text_for :title do %>
-  <% if calculator.passport_country_in_electronic_visa_waiver_list? %>
-    You’ll need an electronic visa waiver (EVW) or a Visitor in Transit visa
-  <% else %>
     You’ll need a visa to pass through the UK in transit
-  <% end %>
 <% end %>
 
 <% govspeak_for :body do %>
-  <% if calculator.passport_country_in_electronic_visa_waiver_list? %>
-    You must either apply for:
-
-    + an [electronic visa waiver](/get-electronic-visa-waiver)
-    + a [Visitor in Transit visa](/transit-visa)
-
-  <% else %>
-    You should apply for a [Visitor in Transit visa](/transit-visa) if you arrive on a flight and will pass through immigration control before you leave the UK.
-  <% end %>
-
-  <% if calculator.electronic_travel_authorisation_warning_notice_required?  %>
-    <%= render partial: 'electronic_travel_authorisation_advice'%>
-  <% end %>
+  You should apply for a [Visitor in Transit visa](/transit-visa) if you arrive on a flight and will pass through immigration control before you leave the UK.
 
   ##Transiting without a visa
 

app/flows/check_uk_visa_flow/outcomes/outcome_transit_to_the_republic_of_ireland.erb

@@ -1,8 +1,6 @@
 <% text_for :title do %>
   <% if calculator.passport_country_is_taiwan? %>
     You will not need a visa if your passport has a personal ID number on the bio data page.
-  <% elsif calculator.passport_country_in_electronic_visa_waiver_list? %>
-    You’ll need an electronic visa waiver (EVW) or a Standard Visitor visa
   <% else %>
     You’ll need a visa to pass through the UK (unless you’re exempt)
   <% end %>
@@ -15,20 +13,10 @@
     [Check what documents you need to bring](/government/publications/visitor-visa-guide-to-supporting-documents) to show officers at the UK border.
 
     If your passport does not have a personal ID number on the bio data page you’ll usually need to apply for a [Standard Visitor visa](/standard-visitor).
-  <% elsif calculator.passport_country_in_electronic_visa_waiver_list? %>
-    You must either apply for:
-
-    + an [electronic visa waiver](/get-electronic-visa-waiver)
-    + a [Standard Visitor visa](/standard-visitor)
-
   <% else %>
     You’ll usually need to apply for a [Standard Visitor visa](/standard-visitor).
   <% end %>
 
-  <% if calculator.electronic_travel_authorisation_warning_notice_required?  %>
-    <%= render partial: 'electronic_travel_authorisation_advice'%>
-  <% end %>
-
   ##Transiting without a visa
 
   You may be eligible to transit without a visa if:

app/flows/check_uk_visa_flow/outcomes/outcome_work_electronic_travel_authorisation.erb

@@ -9,7 +9,7 @@
 
   You will need to [apply for an ETA](/guidance/apply-for-an-electronic-travel-authorisation-eta) to come to the UK if you're either:
 
-  - invited as an expert in your profession for a ‘Permitted Paid Engagement’
+  - invited as an expert in your profession doing a '[permitted paid engagement](/standard-visitor/paid-engagement-event)'
   - visiting for certain business or academic activities, but not working in the UK
 
   You must meet the eligibility requirements and only be doing permitted activities.
@@ -22,9 +22,13 @@
   - provide advocacy in legal proceedings
   - take part in arts, entertainment or sporting activities
 
-  Find out what you can and cannot be paid to do if you’re [visiting the UK for a Permitted Paid Engagement](/permitted-paid-engagement-visa).
+  If you’re doing a permitted paid engagement, you must do it within one month of arriving. You can stay in the UK for up to 6 months, but cannot do any paid engagements after the first month.
 
-  %You may want to [apply for a Permitted Paid Engagement Visitor visa](/permitted-paid-engagement-visa/apply) if you have a criminal record or you’ve previously been refused entry into the UK.
+  Check the full list of [business activities](/standard-visitor/visit-on-business), [academic activities](/standard-visitor/visit-as-an-academic) or [permitted paid engagements](/standard-visitor/paid-engagement) you can do as a Standard Visitor.
+
+  To research certain subjects at postgraduate level or above, you may need an [Academic Technology Approval Scheme (ATAS) certificate](/guidance/find-out-if-you-require-an-atas-certificate). If you do need one, you’ll need to get your ATAS certificate before starting your research.
+
+  %You may want to [apply for a Standard Visitor visa](/standard-visitor/apply-standard-visitor-visa) if you have a criminal record or you’ve previously been refused entry into the UK.
 
   ###What you need at the UK border
 
@@ -39,8 +43,6 @@
   - you’ll leave at the end of your visit
   - you’re able to support yourself and your dependents during your trip (or have funding from someone else to support you)
 
-  Find out more about [visiting the UK for a Permitted Paid Engagement](/permitted-paid-engagement-visa).
-
   ^The rules on what you’ll need to enter the UK may be different if you’re [travelling from Ireland, Jersey, Guernsey or the Isle of Man](/guidance/travelling-between-the-uk-and-ireland-isle-of-man-guernsey-or-jersey).
 
   ##If you’re visiting for certain business or academic activities

app/flows/check_uk_visa_flow/outcomes/outcome_work_m.erb

@@ -9,10 +9,6 @@
 
   <%= render partial: 'estonia_or_latvia', locals: {calculator: calculator} %>
 
-  <% if calculator.electronic_travel_authorisation_warning_notice_required?  %>
-    <%= render partial: 'electronic_travel_authorisation_advice'%>
-  <% end %>
-
   ##Business or academic visits
 
   You can apply for a [Standard Visitor visa](/standard-visitor) if you’re coming to the UK for certain business or academic activities, such as:

app/flows/check_uk_visa_flow/questions/channel_islands_or_isle_of_man.erb

@@ -7,8 +7,6 @@
     <% if calculator.passport_country_in_british_overseas_territories_list? ||
        calculator.passport_country_in_non_visa_national_list? %>
       You might need a UK visa if you don’t have a visa (or a wet ink stamp) for the Channel Islands or the Isle of Man.
-    <% elsif calculator.passport_country_in_electronic_visa_waiver_list? %>
-      You’ll need a UK visa or an  [Electronic Visa Waiver](/get-electronic-visa-waiver) if you don’t have a visa (or wet ink stamp) for the Channel Islands or the Isle of Man.
     <% elsif calculator.passport_country_in_direct_airside_transit_visa_list? ||
        calculator.passport_country_in_visa_national_list? %>
       You’ll need a UK visa if you don’t have a visa (or a wet ink stamp) for the Channel Islands or the Isle of Man.