Merge ~nteodosio/+git/ubuntu-pro:ubuntupro42.0 into ~nteodosio/+git/ubuntu-pro:ubuntu/42.0.1-1ubuntu2-debian-patches-applied

[Nathan Teodosio]

This has 42.0.1-1ubuntu2 with all debian/patches applied as its base.

This has dependencies right for Jammy (tested in a virtual machine).

Have Polkit running if you don't: /usr/lib/policykit-1-gnomeY/polkit-gnome-authentication-agent-1.

I use this script to test:

---->
#!/bin/sh
if ! [ -d build ]; then
    mkdir build
    meson build
fi
ninja -C build || exit 1
if [ "$1" = debug ]; then
    XDG_CURRENT_DESKTOP=ubuntu gdb -ex run --args ./build/gnome-initial-setup/gnome-initial-setup --existing-user
elif [ "$1" = harddebug ]; then
    G_DEBUG=fatal-warnings GTK_THEME=Adwaita XDG_CURRENT_DESKTOP=ubuntu gdb -ex run --args ./build/gnome-initial-setup/gnome-initial-setup --existing-user
else
    XDG_CURRENT_DESKTOP=ubuntu ./build/gnome-initial-setup/gnome-initial-setup --existing-user
fi
<----

[Nathan Teodosio (nteodosio)]

Copying Robert's comment from superseded review https://code.launchpad.net/~nteodosio/+git/ubuntu-pro/+merge/434494:

"""
I'm very confused as to what this PR is doing - it's proposing merging two branches you control, not merging into the gnome-initial-setup branch that matches a released version. The information below also shows merge conflicts, so it seems broken.

I would recommend that you squash all the merges together if this is a single change (you can make a backup branch containing all your commits if you want to refer to them later). It is much harder to review with all these commits.

Just looking at you ubuntupro branch and the files in gnome-initial-setup/pages/ubuntu-pro/:
- It would be easier to read if the three pages were in three .c files.
- The pages would be clearer if they had names that related to what they did, i.e. "gs-ubuntupro-page-1" -> "gs-ubuntupro-services-page"
- The .ui files contain unused id properties.
- The .ui files contain unused position properties (these make future changes more complicated).
- RestJSONResponse is only used inside the .c files, but is defined in the header - if this is private it doesn't need to be exposed like this.
- display_ua_services() should use g_autofree/g_autoptr for variables. This will allow you to remove the goto and just return directly from the function.
- Lots of other functions don't use g_autofree/g_autoptr.
- _GisUbuntuProPage1Private contains unused cancellable, apply_complete_callback, apply_complete_data fields.
- contractToken should be called contract_token.
- You store the PIN in a variable and then set it in the GtkLabel - this is unnecessary and would be simpler just to store in the GtkLabel directly. Otherwise you have the same data in two places (which could get out of sync).
- There's no dispose methods for the page classes, so they leak data.
- You've used 543210 as a timeout, if you want no timeout use G_MAXINT.
- The labels set in update_gui() aren't translatable.
- I haven't been able to get it to compile here or seen the designs so I haven't been able to review that.
"""

[Nathan Teodosio (nteodosio)]

> I'm very confused as to what this PR is doing - it's proposing merging two branches you control, not merging into the gnome-initial-setup branch that matches a released version. The information below also shows merge conflicts, so it seems broken.

This was my mistake, I targeted the wrong gnome-initial-setup version, now it's correctly rebased against Jammy's version 42.0.1-1ubuntu2.

5a0ed85... by Nathan Teodosio on 2022-12-14

UI: Remove unused ID and position properties.

5918804... by Nathan Teodosio on 2022-12-14

RestJSONResponse moved out of header file.

a785fc4... by Nathan Teodosio on 2022-12-14

Use g_autofree/g_autoptr.

3d98ca2... by Nathan Teodosio on 2022-12-14

Remove unused values from Page1Private.

1626906... by Nathan Teodosio on 2022-12-14

contractToken -> contract_token.

7945f63... by Nathan Teodosio on 2022-12-14

Don't store pin in a variable, use it directly to update GTK label.

2311da4... by Nathan Teodosio on 2022-12-14

page{1,2,3} -> {offer,attach,list_services}

[Nathan Teodosio (nteodosio)]

> There's no dispose methods for the page classes, so they leak data.

So those are sort of destructors, right? Are they supposed to look like this[1]? Documentation is a bit too laconic[2]. The print statements didn't trigger when I passed the pages nor when I killed the program. I suppose they would only be triggered at program termination, since GIS allows one to go back to a previous page?

[1]: https://git.launchpad.net/~nteodosio/+git/ubuntu-pro/commit/?id=67340fcdc482e7bf89c1dc644503ca3fb7f403a6
[2]: https://docs.gtk.org/gobject/vfunc.Object.dispose.html

f405e6a... by Nathan Teodosio on 2022-12-14

Translatable strings in attach labels.

6b60922... by Nathan Teodosio on 2023-01-04

Introduce back button, hijack back and next actions.

6859cf1... by Nathan Teodosio on 2023-01-06

Rename: list.?services->services

cf74e20... by Nathan Teodosio on 2023-01-06

Add some comments here and there.

65de5a9... by Nathan Teodosio on 2023-01-06

Introduce utils.[ch].

28b4b04... by Nathan Teodosio on 2023-01-06

Remove set_page_completion function.

c8c8ddf... by Nathan Teodosio on 2023-01-06

Delegate page 1->2 transition to update_gui.

Avoids minor corner case whereby coming back to page 2
with an non-empty token field would have an unsensitive
Next button.

5cd7136... by Nathan Teodosio on 2023-01-06

Use Ubuntu Pro API.

This way we don't have to hard code the contracts URL.

3c6d262... by Nathan Teodosio on 2023-01-10

Only attempt attachment after clicking "Next"

Including after receiving contract_token after submitting PIN.

3d4b6e8... by Nathan Teodosio on 2023-01-10

Increase margin between PIN and status icon.

96aea7b... by Nathan Teodosio on 2023-01-11

Add dark theme detector routine.

cc5096e... by Nathan Teodosio on 2023-01-11

Use different Ubuntu SVG if dark theme in use.

While we are at it, remove display_checkmark function in favor of
the more generic map_scalable_image.

8ba928a... by Nathan Teodosio on 2023-01-11

Add placeholder ubuntu-pro-dark.svg

[Sebastien Bacher (seb128)]

Thanks. It's not a complete review just some notes as I got that version in the ubuntu-desktop ppa for testing

- the ubuntu-pro.svg is actually a png, we either need to convert it or rename, would be easier to handle as a svg
- we need to remove the livepatch page as well (it's currently being displayed in addition to the pro page when not using the --existing-user option)
- the services page doesn't have bullet point at the start of the lines for the services

and the current layout is better for review but we will need to include the changes in the ubuntu patch once we are ready

88a716b... by Nathan Teodosio on 2023-01-11

Add bullet points to services.

4329757... by Nathan Teodosio on 2023-01-11

Nuke livepatch.

[Nathan Teodosio (nteodosio)]

- ubuntu-pro.svg was indeed a PNG at some point, but now it is should be a SVG. Perhaps you had an older version?
- done.
- done.

[Sergio Costas (rastersoft-gmail)]

Added some comments.

4728536... by Nathan Teodosio on 2023-01-11

Make current_page an enum and use switches instead of ifs.

4b3d2d8... by Nathan Teodosio on 2023-01-11

g_print->g_warning for reporting unexpected status.

adaf545... by Nathan Teodosio on 2023-01-11

Remove make_rest_req.

No longer needed after migrating to Pro API.

[Nathan Teodosio (nteodosio)]

Thanks for the review Sergio!

5cc7993... by Nathan Teodosio on 2023-01-11

Implement dispose function and free tokens therein.

5fc5a92... by Nathan Teodosio on 2023-01-11

Disconnect network signal handler in destructor.

[Sergio Costas (rastersoft-gmail)]

I think that now I did explain it better.

[Sergio Costas (rastersoft-gmail)]

Ops... didn't see the last patch.

[Sergio Costas (rastersoft-gmail)]

Added an extra comment about disposing the objects.

6777ad7... by Nathan Teodosio on 2023-01-11

Renaming only

0cd8cd6... by Nathan Teodosio on 2023-01-12

Free token upon successful attachment.

[Sebastien Bacher (seb128)]

I've pushed the current version in the ppa and tested it, small notes

- indeed the svg icon is right now

- the magic token spinner is vertically aligned to the top of the pin, and same for the 'token valid' checkmark and label, could we align them with the middle instead?

- using the magic token workflow, after entering the token on the website and clicking 'next' it prompts for the password/spin for a while (expected) but then we need to click next again. Could we make it so it does the next action by itself at the end of the registration?

review: Needs Fixing

[Nathan Teodosio (nteodosio)]

> Could we make it so it does the next action by itself at the end of the registration?

That means go to the next page, correct? So we'd also want that for the
manual token? I.e.,

- [magic] type pin in browser > click next > prompt > (if success) go to
next page immediately

- [token] type token > Next(or Enter) > prompt > (if success) go to next page
immediately

[Sebastien Bacher (seb128)]

yes, I was testing the magic workflow but the same principle is true for the manual token

b324c7f... by Nathan Teodosio on 2023-01-12

Skip to the next page directly once attachment is complete...

If the user is in the attachment page.

48d183a... by Nathan Teodosio on 2023-01-12

Adjust margins of PIN

[Nathan Teodosio (nteodosio)]

That is done. About

> the magic token spinner is vertically aligned to the top of the pin, and same for the 'token valid' checkmark and label, could we align them with the middle instead?

As discussed, it is centered for me in Yaru and Adwaita. Glade displays it centered too.

There was a slight difference between the PIN's top and bottom margin, which are now equal. I doubt that would account for it though...

[Sebastien Bacher (seb128)]

It now moves to the next page as expected and it feels more centered in the VM with the margin change. Adding one typo in a comment to fix but functionally it works as expected. I'm going to do another review on the code later before doing the ack but I think it feels ready now

e652065... by Nathan Teodosio on 2023-01-12

Typo

b5e987e... by Nathan Teodosio on 2023-01-13

Update the list of files to translate.

Patch by Sebastien Bacher.

[Sebastien Bacher (seb128)]

Great work Nathan, I think it's ready for upload! We need to retro-fit the changes into debian/patches now, probably as an update to 0001-Add-Ubuntu-mode-with-special-pages.patch

review: Approve

[Sergio Costas (rastersoft-gmail)]

Please, wait. I think that there are still some little changes that should be done, referred to the dispose.

[Sebastien Bacher (seb128)]

Ack, we are not going to merge before next week at this point so we can go through another review round today and on Monday

3346f62... by Nathan Teodosio on 2023-01-16

UI: Padding

[Robert Ancell (robert-ancell)]

The diff below shows some merge conflicts, i.e. '+<<<<<<< data/meson.build' - does this branch need updating?

[Nathan Teodosio (nteodosio)]

Those are spurious, I don't know why Launchpad calculates them.

Am 2023/01/17 um 00:20 schrieb Robert Ancell:
> The diff below shows some merge conflicts, i.e. '+<<<<<<< data/meson.build' - does this branch need updating?

[Sergio Costas (rastersoft-gmail)]

Sometimes git does odd things when doing a manual rebase... usually those odd things are fixed just by doing a "git rebase master" (or main, or the base branch from which you did the current branch).

04028f2... by Nathan Teodosio on 2023-01-17

Replace dummy by actual dark logo SVG.

[Nathan Teodosio (nteodosio)]

Thanks Sergio, that did get rid of the conflicts.

007b430... by Nathan Teodosio on 2023-01-17

Indentation and margins for radio buttons.

61fdffb... by Nathan Teodosio on 2023-01-17

Remove leading spaces from radio buttons.

[Robert Ancell (robert-ancell)]

Added some more comments inline.

diff --git a/data/com.ubuntu.welcome.policy.in b/data/com.ubuntu.welcome.policy.in
deleted file mode 100644
index cf623d5..0000000
--- a/data/com.ubuntu.welcome.policy.in
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-
-<policyconfig>
-  <vendor>Ubuntu Welcome</vendor>
-  <vendor_url>https://www.ubuntu.com/</vendor_url>
-
-  <action id="com.ubuntu.welcome.livepatch">
-    <description>Manage Livepatch</description>
-    <message>Authentication is required to enable Livepatch</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-    <annotate key="org.freedesktop.policykit.imply">io.snapcraft.snapd.login com.ubuntu.softwareproperties.applychanges </annotate>
-  </action>
-
-</policyconfig>
\ No newline at end of file
diff --git a/data/meson.build b/data/meson.build
index 0fbb7d1..36c775a 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -99,15 +99,6 @@ if enable_systemd
     )
 endif
 
-i18n.merge_file(
-    input: 'com.ubuntu.welcome.policy.in',
-    output: 'com.ubuntu.welcome.policy',
-    install: true,
-    install_dir: join_paths(data_dir, 'polkit-1', 'actions'),
-    po_dir: po_dir,
-    type: 'xml'
-)
-
 rules_dir = join_paths(data_dir, 'polkit-1', 'rules.d')
 configure_file(
     input: '20-gnome-initial-setup.rules.in',
diff --git a/gnome-initial-setup/gis-assistant.c b/gnome-initial-setup/gis-assistant.c
index b71cd07..af6061f 100644
--- a/gnome-initial-setup/gis-assistant.c
+++ b/gnome-initial-setup/gis-assistant.c
@@ -175,7 +175,8 @@ void
 gis_assistant_previous_page (GisAssistant *assistant)
 {
   g_return_if_fail (assistant->current_page != NULL);
-  switch_to (assistant, find_prev_page (assistant, assistant->current_page));
+  if (!gis_page_go_back(assistant->current_page))
+    switch_to (assistant, find_prev_page (assistant, assistant->current_page));
 }
 
 static void
@@ -260,6 +261,12 @@ update_applying_state (GisAssistant *assistant)
     {
       applying = gis_page_get_applying (assistant->current_page);
       is_first_page = assistant->pages->data == assistant->current_page;
+      /* Hack to prevent the next button from Ubuntu Pro attach page from
+       * being sensitive when the page is first mapped. */
+      if (g_str_equal(
+          GIS_PAGE_GET_CLASS(assistant->current_page)->page_id, "UbuntuPro"
+      ))
+        return;
     }
   gtk_widget_set_sensitive (assistant->forward, !applying);
   gtk_widget_set_sensitive (assistant->done, !applying);
diff --git a/gnome-initial-setup/gis-page.c b/gnome-initial-setup/gis-page.c
index a6553c3..217b073 100644
--- a/gnome-initial-setup/gis-page.c
+++ b/gnome-initial-setup/gis-page.c
@@ -202,6 +202,12 @@ gis_page_real_apply (GisPage      *page,
   return FALSE;
 }
 
+static gboolean
+gis_page_real_go_back (GisPage      *page)
+{
+  return FALSE;
+}
+
 static void
 gis_page_class_init (GisPageClass *klass)
 {
@@ -214,6 +220,7 @@ gis_page_class_init (GisPageClass *klass)
   object_class->set_property = gis_page_set_property;
 
   klass->apply = gis_page_real_apply;
+  klass->go_back = gis_page_real_go_back;
 
   obj_props[PROP_DRIVER] =
     g_param_spec_object ("driver", "", "", GIS_TYPE_DRIVER,
@@ -386,6 +393,14 @@ gis_page_apply_begin (GisPage                *page,
   g_object_notify_by_pspec (G_OBJECT (page), obj_props[PROP_APPLYING]);
 }
 
+gboolean
+gis_page_go_back (GisPage *page)
+{
+  GisPageClass *klass;
+  klass = GIS_PAGE_GET_CLASS (page);
+  return klass->go_back(page);
+}
+
 void
 gis_page_apply_complete (GisPage *page,
                          gboolean valid)
diff --git a/gnome-initial-setup/gis-page.h b/gnome-initial-setup/gis-page.h
index 3d6b25d..03d1ccf 100644
--- a/gnome-initial-setup/gis-page.h
+++ b/gnome-initial-setup/gis-page.h
@@ -57,6 +57,7 @@ struct _GisPageClass
   void         (*locale_changed) (GisPage *page);
   gboolean     (*apply) (GisPage *page,
                          GCancellable *cancellable);
+  gboolean     (*go_back) (GisPage *page);
   gboolean     (*save_data) (GisPage  *page,
                              GError  **error);
   void         (*shown) (GisPage *page);
@@ -81,6 +82,7 @@ void         gis_page_locale_changed (GisPage *page);
 void         gis_page_apply_begin (GisPage *page, GisPageApplyCallback callback, gpointer user_data);
 void         gis_page_apply_cancel (GisPage *page);
 void         gis_page_apply_complete (GisPage *page, gboolean valid);
+gboolean     gis_page_go_back (GisPage *page);
 gboolean     gis_page_get_applying (GisPage *page);
 gboolean     gis_page_save_data (GisPage  *page,
                                  GError  **error);
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 4fe6a55..00a2cfb 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -46,7 +46,7 @@
 #include "pages/password/gis-password-page.h"
 #include "pages/summary/gis-summary-page.h"
 #include "pages/ubuntu-report/gis-ubuntu-report-page.h"
-#include "pages/livepatch/gis-livepatch-page.h"
+#include "pages/ubuntu-pro/gis-ubuntupro-page.h"
 #include "pages/apps/gis-apps-page.h"
 
 #define VENDOR_PAGES_GROUP "pages"
@@ -89,7 +89,7 @@ static PageData page_table[] = {
 
 static PageData ubuntu_page_table[] = {
   PAGE (goa,            FALSE),
-  PAGE (livepatch,      FALSE),
+  PAGE (ubuntu_pro,     FALSE),
   PAGE (ubuntu_report,  FALSE),
   PAGE (privacy,        FALSE),
   PAGE (account,        TRUE),
@@ -99,8 +99,8 @@ static PageData ubuntu_page_table[] = {
 };
 
 static PageData unity_page_table[] = {
+  PAGE (ubuntu_pro,     FALSE),
   PAGE (goa,            FALSE),
-  PAGE (livepatch,      FALSE),
   PAGE (ubuntu_report,  FALSE),
   PAGE (account,        TRUE),
   PAGE (password,       TRUE),
diff --git a/gnome-initial-setup/pages/livepatch/gis-auth-dialog.c b/gnome-initial-setup/pages/livepatch/gis-auth-dialog.c
deleted file mode 100644
index eceb26e..0000000
--- a/gnome-initial-setup/pages/livepatch/gis-auth-dialog.c
+++ /dev/null
@@ -1,528 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
- * Copyright (C) 2018 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- * Written by:
- *     Andrea Azzarone <[e-mail]>
- */
-
-#include "gis-auth-dialog.h"
-
-#include <glib/gi18n.h>
-#define GOA_API_IS_SUBJECT_TO_CHANGE
-#include <goa/goa.h>
-#define GOA_BACKEND_API_IS_SUBJECT_TO_CHANGE
-#include <goabackend/goabackend.h>
-
-struct _GisAuthDialog
-{
-  GtkDialog parent_instance;
-
-  GoaClient *goa_client;
-  GtkListStore *liststore_account;
-
-  GtkWidget *error_bar;
-  GtkWidget *label_error;
-  GtkWidget *label_header;
-  GtkWidget *combobox_account;
-  GtkWidget *label_account;
-  GtkWidget *button_add_another;
-  GtkWidget *button_cancel;
-  GtkWidget *button_continue;
-
-  GCancellable *cancellable;
-  guint error_timeout;
-};
-
-static void gis_auth_dialog_initable_iface_init (GInitableIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (GisAuthDialog, gis_auth_dialog, GTK_TYPE_DIALOG,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gis_auth_dialog_initable_iface_init))
-
-enum {
-  COLUMN_ID,
-  COLUMN_EMAIL,
-  COLUMN_ACCOUNT,
-  N_COLUMNS
-};
-
-static gboolean
-gis_auth_dialog_ignore_account (GoaAccount *account)
-{
-  return g_strcmp0 (goa_account_get_provider_type (account), "ubuntusso") != 0;
-}
-
-static void gis_auth_dialog_set_error (GisAuthDialog *self,
-                                       const gchar *text);
-
-static gboolean
-gis_auth_dialog_error_timeout_cb (GisAuthDialog *self)
-{
-  /* Hide the error bar */
-  gis_auth_dialog_set_error (self, NULL);
-  return G_SOURCE_REMOVE;
-}
-
-static void
-gis_auth_dialog_set_error (GisAuthDialog *self,
-                           const gchar *text)
-{
-  /* Reset current error timeout */
-  if (self->error_timeout > 0) {
-    g_source_remove (self->error_timeout);
-    self->error_timeout = 0;
-  }
-
-  if (!text) {
-    /* Hide the error bar if text is NULL */
-    gtk_info_bar_set_revealed (GTK_INFO_BAR (self->error_bar), FALSE);
-    gtk_widget_set_visible (self->error_bar, FALSE);
-  } else {
-    /* Reveal the error bar if text is not NULL */
-    g_autofree gchar *markup = NULL;
-    markup = g_strdup_printf (_("Failed to add an Ubuntu Single Sign-on account: %s."), text);
-    gtk_label_set_markup (GTK_LABEL (self->label_error), markup);
-    gtk_widget_set_visible (self->error_bar, TRUE);
-    gtk_info_bar_set_revealed (GTK_INFO_BAR (self->error_bar), TRUE);
-    self->error_timeout = g_timeout_add_seconds (10, (GSourceFunc) gis_auth_dialog_error_timeout_cb, self);
-  }
-}
-
-static void
-gis_auth_dialog_set_header (GisAuthDialog *self,
-                            const gchar *text)
-{
-  g_autofree gchar *markup = NULL;
-  markup = g_strdup_printf ("<span size='larger' weight='bold'>%s</span>", text);
-  gtk_label_set_markup (GTK_LABEL (self->label_header), markup);
-}
-
-static gint
-gis_auth_dialog_get_naccounts (GisAuthDialog *self)
-{
-  return gtk_tree_model_iter_n_children (GTK_TREE_MODEL (self->liststore_account), NULL);
-}
-
-static gboolean
-gis_auth_dialog_get_nth_account_data (GisAuthDialog *self,
-                                      gint n,
-                                      ...)
-{
-  GtkTreeIter iter;
-  va_list var_args;
-
-  if (!gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (self->liststore_account), &iter, NULL, n))
-    return FALSE;
-
-  va_start (var_args, n);
-  gtk_tree_model_get_valist (GTK_TREE_MODEL (self->liststore_account), &iter, var_args);
-  va_end (var_args);
-
-  return TRUE;
-}
-
-static void
-gis_auth_dialog_check_ui (GisAuthDialog *self,
-                          gboolean select)
-{
-  gint naccounts = gis_auth_dialog_get_naccounts (self);
-
-  if (naccounts == 0) {
-    gis_auth_dialog_set_header (self, _("To use Livepatch, you need to use an Ubuntu One Account."));
-    gtk_widget_set_visible (self->combobox_account, FALSE);
-    gtk_widget_set_visible (self->label_account, FALSE);
-    gtk_widget_set_visible (self->button_add_another, FALSE);
-    gtk_button_set_label (GTK_BUTTON (self->button_continue), _("Sign In / Register…"));
-  } else if (naccounts == 1) {
-    g_autofree gchar *email = NULL;
-
-    gis_auth_dialog_set_header (self, _("To use Livepatch, you need to use your Ubuntu One Account."));
-    gtk_widget_set_visible (self->combobox_account, FALSE);
-    gtk_widget_set_visible (self->label_account, TRUE);
-    gtk_widget_set_visible (self->button_add_another, TRUE);
-    gtk_button_set_label (GTK_BUTTON (self->button_continue), _("Continue"));
-    gis_auth_dialog_get_nth_account_data (self, 0, COLUMN_EMAIL, &email, -1);
-    gtk_label_set_text (GTK_LABEL (self->label_account), email);
-  } else {
-    gis_auth_dialog_set_header (self, _("To use Livepatch, you need to use an Ubuntu One Account."));
-    gtk_widget_set_visible (self->combobox_account, TRUE);
-    gtk_widget_set_visible (self->label_account, FALSE);
-    gtk_widget_set_visible (self->button_add_another, TRUE);
-    gtk_button_set_label (GTK_BUTTON (self->button_continue), _("Use"));
-
-    if (select) {
-      gtk_combo_box_set_active (GTK_COMBO_BOX (self->combobox_account), naccounts - 1);
-    } else if (gtk_combo_box_get_active (GTK_COMBO_BOX (self->combobox_account)) == -1) {
-      gtk_combo_box_set_active (GTK_COMBO_BOX (self->combobox_account), 0);
-    }
-  }
-}
-
-static gboolean
-gis_auth_dialog_get_account_iter (GisAuthDialog *self,
-                                  GoaAccount *account,
-                                  GtkTreeIter *iter)
-{
-  gboolean valid;
-
-  valid = gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (self->liststore_account), iter, NULL, 0);
-
-  while (valid) {
-    g_autofree gchar *id;
-    gtk_tree_model_get (GTK_TREE_MODEL (self->liststore_account), iter, COLUMN_ID, &id, -1);
-    if (g_strcmp0 (id, goa_account_get_id (account)) == 0)
-      return TRUE;
-    else
-      valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (self->liststore_account), iter);
-  }
-
-  return FALSE;
-}
-
-static void
-gis_auth_dialog_add_account (GisAuthDialog *self,
-                             GoaAccount *account,
-                             gboolean select)
-{
-  GtkTreeIter iter;
-
-  if (gis_auth_dialog_ignore_account (account) ||
-      gis_auth_dialog_get_account_iter (self, account, &iter))
-    return;
-
-  gtk_list_store_append (self->liststore_account, &iter);
-  gtk_list_store_set (self->liststore_account, &iter,
-                      COLUMN_ID, goa_account_get_id (account),
-                      COLUMN_EMAIL, goa_account_get_presentation_identity (account),
-                      COLUMN_ACCOUNT, account,
-                      -1);
-
-  gis_auth_dialog_check_ui (self, select);
-}
-
-static void
-gis_auth_dialog_remove_account (GisAuthDialog *self,
-                                GoaAccount *account)
-{
-  GtkTreeIter iter;
-
-  if (gis_auth_dialog_ignore_account (account) ||
-     !gis_auth_dialog_get_account_iter (self, account, &iter))
-    return;
-
-  gtk_list_store_remove (self->liststore_account, &iter);
-  gis_auth_dialog_check_ui (self, FALSE);
-}
-
-static void
-gis_auth_dialog_setup_model (GisAuthDialog *self)
-{
-  g_autoptr(GList) accounts = goa_client_get_accounts (self->goa_client);
-
-  for (GList *l = accounts; l != NULL; l = l->next) {
-    gis_auth_dialog_add_account (self,  goa_object_peek_account (l->data), FALSE);
-    g_object_unref (l->data);
-  }
-}
-
-static GoaAccount*
-gis_auth_dialog_show_sso (GisAuthDialog *self,
-                          GoaAccount *account)
-{
-  g_autoptr(GoaProvider) provider = NULL;
-  g_autoptr(GError) error = NULL;
-  GoaObject *goa_object = NULL;
-  GoaAccount *ret = NULL;
-
-  /* Check if ubuntusso accounts are supported */
-  provider = goa_provider_get_for_provider_type ("ubuntusso");
-  if (provider == NULL) {
-    gis_auth_dialog_set_error (self, _("Ubuntu Single Sign-on accounts are not supported"));
-    goto out;
-  }
-
-  if (!account) {
-    GtkWidget *dialog = NULL;
-    /* Show the login dialog */
-    dialog = gtk_dialog_new_with_buttons (_("Add Account"),
-                                          GTK_WINDOW (self),
-                                          GTK_DIALOG_MODAL
-                                          | GTK_DIALOG_DESTROY_WITH_PARENT
-                                          | GTK_DIALOG_USE_HEADER_BAR,
-                                          NULL, NULL);
-
-    /* Set dialog to not resize. */
-    gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-
-    goa_object = goa_provider_add_account (provider,
-                                           self->goa_client,
-                                           GTK_DIALOG (dialog),
-                                           GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
-                                           &error);
-
-    gtk_widget_destroy (dialog);
-  } else {
-    /* Show the refresh dialog */
-    goa_object = goa_client_lookup_by_id (self->goa_client, goa_account_get_id (account));
-    goa_provider_refresh_account (provider,
-                                  self->goa_client,
-                                  goa_object,
-                                  GTK_WINDOW (self),
-                                  &error);
-  }
-
-  if (error) {
-    if (!g_error_matches (error, GOA_ERROR, GOA_ERROR_DIALOG_DISMISSED))
-      gis_auth_dialog_set_error (self, error->message);
-    goto out;
-  }
-
-  ret = goa_object_get_account (goa_object);
-
- out:
-  g_clear_object (&goa_object);
-  return ret;
-}
-
-static GoaAccount*
-gis_auth_dialog_get_selected_account (GisAuthDialog *self)
-{
-  GoaAccount *goa_account = NULL;
-  gint naccounts = gis_auth_dialog_get_naccounts (self);
-
-  if (naccounts == 1) {
-    gis_auth_dialog_get_nth_account_data (self, 0, COLUMN_ACCOUNT, &goa_account, -1);
-  } else  if (naccounts > 1) {
-    gint active = gtk_combo_box_get_active (GTK_COMBO_BOX (self->combobox_account));
-    gis_auth_dialog_get_nth_account_data (self, active, COLUMN_ACCOUNT, &goa_account, -1);
-  }
-
-  return goa_account;
-}
-
-void
-gis_auth_dialog_ensure_crendentials_cb (GObject *source_object,
-                                        GAsyncResult *res,
-                                        gpointer user_data)
-{
-  GisAuthDialog *self = (GisAuthDialog*) user_data;
-  GoaAccount *account = GOA_ACCOUNT (source_object);
-  g_autoptr(GError) error = NULL;
-
-  if (!goa_account_call_ensure_credentials_finish (account, NULL, res, &error)) {
-    if (g_error_matches (error, GOA_ERROR, GOA_ERROR_NOT_AUTHORIZED)) {
-      /* Show the refresh account is credentials are expired */
-      account = gis_auth_dialog_show_sso (self, account);
-      /* account is NULL in case of error or dismissal */
-      if (account != NULL) {
-        gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
-        g_object_unref (account);
-      }
-    }
-  } else {
-    gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
-  }
-}
-
-static void
-gis_auth_dialog_response_if_valid (GisAuthDialog *self)
-{
-  GoaAccount *goa_account = gis_auth_dialog_get_selected_account (self);
-
-  if (goa_account)
-    goa_account_call_ensure_credentials (goa_account,
-                                         self->cancellable,
-                                         gis_auth_dialog_ensure_crendentials_cb,
-                                         self);
-
-  g_clear_object (&goa_account);
-}
-
-static void
-gis_auth_dialog_account_added_cb (GoaClient *client,
-                                  GoaObject *object,
-                                  GisAuthDialog *self)
-{
-  GoaAccount *account = goa_object_peek_account (object);
-  gis_auth_dialog_add_account (self, account, FALSE);
-}
-
-static void
-gis_auth_dialog_account_removed_cb (GoaClient *client,
-                                    GoaObject *object,
-                                    GisAuthDialog *self)
-{
-  GoaAccount *account = goa_object_peek_account (object);
-  gis_auth_dialog_remove_account (self, account);
-}
-
-static void
-gis_auth_dialog_button_add_another_cb (GtkButton *button,
-                                       GisAuthDialog *self)
-{
-  GoaAccount *account;
-
-  g_signal_handlers_block_by_func (self->goa_client, gis_auth_dialog_account_added_cb, self);
-
-  account = gis_auth_dialog_show_sso (self, NULL);
-
-   /* account is NULL in case of error or dismissal */
-  if (account != NULL) {
-    gis_auth_dialog_add_account (self, account, TRUE);
-    gis_auth_dialog_response_if_valid (self);
-    g_object_unref (account);
-  }
-
-  g_signal_handlers_unblock_by_func (self->goa_client, gis_auth_dialog_account_added_cb, self);
-}
-
-static void
-gis_auth_dialog_button_cancel_cb (GtkButton *button,
-                                  GisAuthDialog *self)
-{
-  gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_CANCEL);
-}
-
-static void
-gis_auth_dialog_button_continue_cb (GtkButton     *button,
-                                    GisAuthDialog *self)
-{
-  gint naccounts = gis_auth_dialog_get_naccounts (self);
-
-  if (naccounts == 0)
-    gis_auth_dialog_button_add_another_cb (GTK_BUTTON (self->button_add_another), self);
-  else
-    gis_auth_dialog_response_if_valid (self);
-}
-
-/* GObject */
-
-static void
-gis_auth_dialog_dispose (GObject *object)
-{
-  GisAuthDialog *self = GIS_AUTH_DIALOG (object);
-
-  g_clear_object (&self->goa_client);
-
-  if (self->error_timeout > 0) {
-    g_source_remove (self->error_timeout);
-    self->error_timeout = 0;
-  }
-
-  g_cancellable_cancel (self->cancellable);
-  g_clear_object (&self->cancellable);
-
-  G_OBJECT_CLASS (gis_auth_dialog_parent_class)->dispose (object);
-}
-
-static void
-gis_auth_dialog_class_init (GisAuthDialogClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  object_class->dispose = gis_auth_dialog_dispose;
-
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/initial-setup/gis-auth-dialog.ui");
-
-  gtk_widget_class_bind_template_child (widget_class, GisAuthDialog, error_bar);
-  gtk_widget_class_bind_template_child (widget_class, GisAuthDialog, label_error);
-  gtk_widget_class_bind_template_child (widget_class, GisAuthDialog, label_header);
-  gtk_widget_class_bind_template_child (widget_class, GisAuthDialog, combobox_account);
-  gtk_widget_class_bind_template_child (widget_class, GisAuthDialog, label_account);
-  gtk_widget_class_bind_template_child (widget_class, GisAuthDialog, button_add_another);
-  gtk_widget_class_bind_template_child (widget_class, GisAuthDialog, button_cancel);
-  gtk_widget_class_bind_template_child (widget_class, GisAuthDialog, button_continue);
-  gtk_widget_class_bind_template_child (widget_class, GisAuthDialog, liststore_account);
-
-
-  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), gis_auth_dialog_button_add_another_cb);
-  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), gis_auth_dialog_button_cancel_cb);
-  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), gis_auth_dialog_button_continue_cb);
-}
-
-static void
-gis_auth_dialog_init (GisAuthDialog *self)
-{
-  self->cancellable = g_cancellable_new ();
-
-  gtk_widget_init_template (GTK_WIDGET (self));
-  gtk_widget_grab_focus (self->button_continue);
-}
-
-/* GInitable */
-
-static gboolean
-gis_auth_dialog_initable_init (GInitable *initable,
-                               GCancellable *cancellable,
-                               GError  **error)
-{
-  GisAuthDialog *self;
-
-  g_return_val_if_fail (GIS_IS_AUTH_DIALOG (initable), FALSE);
-
-  self = GIS_AUTH_DIALOG (initable);
-
-  self->goa_client = goa_client_new_sync (NULL, error);
-  if (!self->goa_client)
-    return FALSE;
-
-  gis_auth_dialog_setup_model (self);
-  gis_auth_dialog_check_ui (self, FALSE);
-
-  /* Be ready to other accounts */
-  g_signal_connect (self->goa_client, "account-added", G_CALLBACK (gis_auth_dialog_account_added_cb), self);
-  g_signal_connect (self->goa_client, "account-removed", G_CALLBACK (gis_auth_dialog_account_removed_cb), self);
-
-  return TRUE;
-}
-
-static void
-gis_auth_dialog_initable_iface_init (GInitableIface *iface)
-{
-  iface->init = gis_auth_dialog_initable_init;
-}
-
-/* Public API */
-
-GtkWidget *
-gis_auth_dialog_new (GError **error)
-{
-  GisAuthDialog *dialog;
-
-  dialog = g_initable_new (GIS_TYPE_AUTH_DIALOG,
-                           NULL, error,
-                           "title", "",
-                           NULL);
-
-  return GTK_WIDGET (dialog);
-}
-
-gchar *
-gis_auth_dialog_get_account_id (GisAuthDialog *self)
-{
-  GoaAccount *goa_account;
-  gchar *account_id = NULL;
-
-  g_return_val_if_fail (GIS_IS_AUTH_DIALOG (self), NULL);
-
-  goa_account = gis_auth_dialog_get_selected_account (self);
-  if (goa_account)
-    account_id = goa_account_dup_id (goa_account);
-
-  g_clear_object (&goa_account);
-  return account_id;
-}
diff --git a/gnome-initial-setup/pages/livepatch/gis-auth-dialog.h b/gnome-initial-setup/pages/livepatch/gis-auth-dialog.h
deleted file mode 100644
index 09bfb69..0000000
--- a/gnome-initial-setup/pages/livepatch/gis-auth-dialog.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
- * Copyright (C) 2018 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- * Written by:
- *     Andrea Azzarone <[e-mail]>
- */
-
-#ifndef __GIS_AUTH_DIALOG_H__
-#define __GIS_AUTH_DIALOG_H__
-
-#define GOA_API_IS_SUBJECT_TO_CHANGE
-#include <goa/goa.h>
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define GIS_TYPE_AUTH_DIALOG (gis_auth_dialog_get_type ())
-
-G_DECLARE_FINAL_TYPE (GisAuthDialog, gis_auth_dialog, GIS, AUTH_DIALOG, GtkDialog)
-
-GtkWidget *gis_auth_dialog_new ();
-gchar     *gis_auth_dialog_get_account_id (GisAuthDialog *dialog);
-
-G_END_DECLS
-
-#endif /* __GIS_AUTH_DIALOG_H__ */
diff --git a/gnome-initial-setup/pages/livepatch/gis-auth-dialog.ui b/gnome-initial-setup/pages/livepatch/gis-auth-dialog.ui
deleted file mode 100644
index 0fe40b2..0000000
--- a/gnome-initial-setup/pages/livepatch/gis-auth-dialog.ui
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
-<interface>
-  <requires lib="gtk+" version="3.10"/>
-  <object class="GtkListStore" id="liststore_account">
-    <columns>
-      <!-- column-name Id -->
-      <column type="gchararray"/>
-      <!-- column-name Email -->
-      <column type="gchararray"/>
-      <!-- column-name Account -->
-      <column type="GObject"/>
-    </columns>
-  </object>
-  <template class="GisAuthDialog" parent="GtkDialog">
-    <property name="can_focus">False</property>
-    <property name="resizable">False</property>
-    <property name="type_hint">dialog</property>
-    <child>
-      <placeholder/>
-    </child>
-    <child internal-child="vbox">
-      <object class="GtkBox">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkButton" id="button_add_another">
-                <property name="label" translatable="yes">Add another…</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <signal name="clicked" handler="gis_auth_dialog_button_add_another_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-                <property name="secondary">True</property>
-                <property name="non_homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button_cancel">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <signal name="clicked" handler="gis_auth_dialog_button_cancel_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-                <property name="non_homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button_continue">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <signal name="clicked" handler="gis_auth_dialog_button_continue_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-                <property name="non_homogeneous">True</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkInfoBar" id="error_bar">
-            <property name="can_focus">False</property>
-            <property name="no_show_all">True</property>
-            <property name="message_type">error</property>
-            <property name="revealed">False</property>
-            <child internal-child="action_area">
-              <object class="GtkButtonBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">6</property>
-                <property name="layout_style">end</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child internal-child="content_area">
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">16</property>
-                <child>
-                  <object class="GtkLabel" id="label_error">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="justify">fill</property>
-                    <property name="wrap">True</property>
-                    <property name="width_chars">0</property>
-                    <property name="max_width_chars">50</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">start</property>
-            <property name="border_width">12</property>
-            <property name="spacing">18</property>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="valign">start</property>
-                <property name="icon_name">distributor-logo</property>
-                <property name="icon_size">6</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="box_auth">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">12</property>
-                <child>
-                  <object class="GtkLabel" id="label_header">
-                    <property name="name">label_header</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="valign">start</property>
-                    <property name="use_markup">True</property>
-                    <property name="justify">fill</property>
-                    <property name="wrap">True</property>
-                    <property name="max_width_chars">40</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBox" id="combobox_account">
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="model">liststore_account</property>
-                    <child>
-                      <object class="GtkCellRendererText"/>
-                      <attributes>
-                        <attribute name="text">1</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_account">
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>
diff --git a/gnome-initial-setup/pages/livepatch/gis-livepatch-page.c b/gnome-initial-setup/pages/livepatch/gis-livepatch-page.c
deleted file mode 100644
index eab2fb6..0000000
--- a/gnome-initial-setup/pages/livepatch/gis-livepatch-page.c
+++ /dev/null
@@ -1,538 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
- * Copyright (C) 2018 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- * Written by:
- *     Andrea Azzarone <[e-mail]>
- */
-
-/* Canonical Livepatch page {{{1 */
-
-#define PAGE_ID "livepatch"
-
-#include "config.h"
-#include "gis-auth-dialog.h"
-#include "gis-livepatch-page.h"
-#include "livepatch-resources.h"
-
-#define GOA_API_IS_SUBJECT_TO_CHANGE
-#include <goa/goa.h>
-#define GOA_BACKEND_API_IS_SUBJECT_TO_CHANGE
-#include <goabackend/goabackend.h>
-
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-#include <polkit/polkit.h>
-
-struct _GisLivepatchPagePrivate {
-  GtkWidget *setup_button;
-  GtkWidget *message_box;
-  GtkWidget *signout_button;
-  GtkWidget *message_label;
-
-  GoaClient *goa_client;
-  GoaAccount *goa_account;
-  GPermission *permission;
-
-  gchar *token;
-  gboolean waiting_for_livepatch_response;
-  gboolean user_current_choice;
-};
-typedef struct _GisLivepatchPagePrivate GisLivepatchPagePrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE (GisLivepatchPage, gis_livepatch_page, GIS_TYPE_PAGE);
-
-#define LIVEPATCH_ENABLING_MESSAGE  _("You're all set: Livepatch is now being enabled.")
-#define LIVEPATCH_ENABLE_SUCCESS_MESSAGE  _("You're all set: Livepatch is now on.")
-#define LIVEPATCH_ENABLE_FAILURE_MESSAGE  _("Failed to setup Livepatch: please retry.")
-#define LIVEPATCH_DISABLE_FAILURE_MESSAGE _("Failed to disable Livepatch: please retry.")
-
-static gboolean
-set_livepatch_enabled (GisLivepatchPage *page,
-                       gboolean          value);
-
-static gboolean
-is_livepatch_enabled ()
-{
-  return g_file_test ("/var/snap/canonical-livepatch/common/machine-token",
-                      G_FILE_TEST_EXISTS);
-}
-
-static char *
-get_item (const char *buffer, const char *name)
-{
-  g_autofree gchar *label = NULL;
-  gchar *start = NULL, *end = NULL;
-  gchar end_char;
-
-  label = g_strconcat (name, "=", NULL);
-  if ((start = strstr (buffer, label)) != NULL) {
-    start += strlen (label);
-    end_char = '\n';
-    if (*start == '"') {
-      start++;
-      end_char = '"';
-    }
-    end = strchr (start, end_char);
-  }
-
-  if (start != NULL && end != NULL)
-    return g_strndup (start, end - start);
-  else
-    return NULL;
-}
-
-static gboolean
-is_lts ()
-{
-  g_autofree gchar *buffer = NULL;
-  g_autofree gchar *version = NULL;
-
-  if (g_file_get_contents ("/etc/os-release", &buffer, NULL, NULL))
-    version = get_item (buffer, "VERSION");
-
-  return version && g_strrstr (version, "LTS") != NULL;
-}
-
-static gboolean
-is_livepatch_supported ()
-{
-  return is_lts ();
-}
-
-static void
-open_software_properties ()
-{
-  g_autofree gchar *command = NULL;
-  g_autoptr(GAppInfo) info = NULL;
-  g_autoptr(GError) error = NULL;
-
-  info = g_app_info_create_from_commandline ("software-properties-gtk --open-tab=2", NULL, G_APP_INFO_CREATE_NONE, &error);
-  if (info == NULL) {
-     g_warning ("Failed to get launch information from software-properties-gtk: %s", error->message);
-     return;
-  }
-
-  if (!g_app_info_launch (info, NULL, NULL, &error)) {
-     g_warning ("Failed to launch software-properties-gtk: %s", error->message);
-     return;
-  }
-}
-
-static void
-on_livepatch_enabled (GObject *source_object,
-                      GAsyncResult *res,
-                      gpointer data)
-{
-  GisLivepatchPage *page = GIS_LIVEPATCH_PAGE (data);
-  GisLivepatchPagePrivate *priv = gis_livepatch_page_get_instance_private (page);
-  g_autoptr(GVariant) result = NULL;
-  gboolean success = TRUE;
-  gboolean current_state = is_livepatch_enabled ();
-  g_autofree gchar *out_message = NULL;
-  g_autoptr(GError) error = NULL;
-
-  priv->waiting_for_livepatch_response = FALSE;
-
-  result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error);
-  if (result == NULL) {
-    g_warning ("Failed to enable/disable Livepatch through DBus: %s\n", error->message);
-    out_message = g_strdup (error->message);
-    success = FALSE;
-  } else {
-    gboolean out_error;
-
-    g_variant_get (result, "(bs)", &out_error, &out_message);
-    if (out_error) {
-      g_warning ("Failed to enable/disable Livepatch: %s\n", out_message);
-      success = FALSE;
-    }
-  }
-
-  if (success) {
-     /* We succeded to enable or disable livepatch.
-        Check if this corresponds to the current user choice. */
-    if (current_state != priv->user_current_choice) {
-      set_livepatch_enabled (page, priv->user_current_choice);
-    } else if (current_state) {
-      gtk_label_set_text (GTK_LABEL (priv->message_label), LIVEPATCH_ENABLE_SUCCESS_MESSAGE);
-    }
-  } else if (current_state != priv->user_current_choice) {
-    GisAssistant *assistant = gis_driver_get_assistant (GIS_PAGE (page)->driver);
-
-    /* We failed to enable or disable livepatch. Show an error message if
-       the current state does not correpond the current user choice.
-       Ignore the message if the call failed but the current status correponds
-       to the user choice. */
-    if (priv->user_current_choice) {
-      gtk_label_set_text (GTK_LABEL (priv->message_label), LIVEPATCH_ENABLE_FAILURE_MESSAGE);
-      gtk_widget_set_sensitive (priv->setup_button, TRUE);
-    } else {
-      gtk_label_set_text (GTK_LABEL (priv->message_label), LIVEPATCH_DISABLE_FAILURE_MESSAGE);
-    }
-
-    if (gis_assistant_get_current_page (assistant) != GIS_PAGE (page)) {
-      GtkWidget *dialog;
-
-      dialog =  gtk_message_dialog_new_with_markup (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (page))),
-                                                    GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                    GTK_MESSAGE_ERROR,
-                                                    GTK_BUTTONS_NONE,
-                                                    "<span font_size='x-large' font_weight='bold'>%s</span>",
-                                                    _("Sorry there's been a problem with setting up Canonical Livepatch"));
-      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                _("The error was: %s"),
-                                                out_message);
-      gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-                             _("Settings…"),
-                             GTK_RESPONSE_OK,
-                             _("Ignore"),
-                             GTK_RESPONSE_CANCEL,
-                             NULL);
-
-      if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
-        open_software_properties ();
-
-      gtk_widget_destroy (dialog);
-    }
-  }
-
-  gis_driver_uninhibit_quit (GIS_PAGE (page)->driver);
-}
-
-static gboolean
-set_livepatch_enabled (GisLivepatchPage *page,
-                       gboolean          value)
-{
-  GisLivepatchPagePrivate *priv = gis_livepatch_page_get_instance_private (page);
-  g_autoptr(GDBusProxy) proxy = NULL;
-  g_autoptr(GError) error = NULL;
-  GVariant *args;
-
-  proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-                                         G_DBUS_PROXY_FLAGS_NONE,
-                                         NULL, /* info */
-                                         "com.ubuntu.SoftwareProperties",
-                                         "/",
-                                         "com.ubuntu.SoftwareProperties",
-                                         NULL, /* cancellable */
-                                         &error);
-
-  if (proxy == NULL) {
-    g_warning ("Failed to get dbus proxy for com.ubuntu.SoftwareProperties: %s", error->message);
-    return FALSE;
-  }
-
-  if (value) {
-    args = g_variant_new ("(bs)", TRUE, priv->token);
-  } else {
-    args = g_variant_new ("(bs)", FALSE, "");
-  }
-
-  gis_driver_inhibit_quit (GIS_PAGE (page)->driver);
-  priv->waiting_for_livepatch_response = TRUE;
-  g_dbus_proxy_call (proxy,
-                     "SetLivepatchEnabled",
-                     args,
-                     /* Fallback to interactive authorization if the meta action didn't work */
-                     G_DBUS_CALL_FLAGS_ALLOW_INTERACTIVE_AUTHORIZATION,
-                     1200000, /* 20 minutes timeout should be enough to install and enable livepatch */
-                     NULL, /* cancellable */
-                     on_livepatch_enabled,
-                     page);
-
-  return TRUE;
-}
-
-static void
-on_livepatch_token_ready (GObject      *source_object,
-                          GAsyncResult *res,
-                          gpointer      data)
-{
-  GisLivepatchPage *page = GIS_LIVEPATCH_PAGE (data);
-  GisLivepatchPagePrivate *priv = gis_livepatch_page_get_instance_private (page);
-  GoaPasswordBased *password_based = GOA_PASSWORD_BASED (source_object);
-  g_autoptr(GError) error = NULL;
-
-  if (!goa_password_based_call_get_password_finish (password_based, &priv->token, res, &error)) {
-    g_warning ("Failed to get livepatch token: %s", error->message);
-    gtk_widget_set_sensitive (priv->setup_button, TRUE);
-    return;
-  }
-
-  priv->user_current_choice = TRUE;
-  gtk_widget_set_visible (priv->message_box, TRUE);
-  if (set_livepatch_enabled (page, TRUE)) {
-    gtk_label_set_text (GTK_LABEL (priv->message_label), LIVEPATCH_ENABLING_MESSAGE);
-  } else {
-    gtk_label_set_text (GTK_LABEL (priv->message_label), LIVEPATCH_ENABLE_FAILURE_MESSAGE);
-    gtk_widget_set_sensitive (priv->setup_button, TRUE);
-  }
-}
-
-static void
-goa_account_store (const gchar *account_id)
-{
-  GSettingsSchemaSource *source;
-  g_autoptr(GSettingsSchema) schema = NULL;
-  g_autoptr(GSettings) settings = NULL;
-
-  /* Check if the gsettings schema is installed */
-  source = g_settings_schema_source_get_default ();
-  if (!source)
-    return;
-  schema = g_settings_schema_source_lookup (source, "com.ubuntu.SoftwareProperties", TRUE);
-  if (!schema)
-    return;
-
-  /* If the schema is installed... */
-  settings = g_settings_new ("com.ubuntu.SoftwareProperties");
-  g_settings_set_string (settings, "goa-account-id", account_id);
-}
-
-static void
-login_and_enable_livepatch (GisLivepatchPage *page)
-{
-  GisLivepatchPagePrivate *priv = gis_livepatch_page_get_instance_private (page);
-  g_autofree gchar *account_id = NULL;
-  GoaObject *goa_object = NULL;
-  GoaPasswordBased *password_based = NULL;
-  GtkWidget *dialog = NULL;
-  g_autoptr(GError) error = NULL;
-
-  /* show the login dialog if needed */
-  dialog = gis_auth_dialog_new (&error);
-  if (dialog) {
-    gtk_window_set_transient_for (GTK_WINDOW (dialog),
-                                  GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (page))));
-
-    if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
-        account_id = gis_auth_dialog_get_account_id (GIS_AUTH_DIALOG (dialog));
-        goa_object = goa_client_lookup_by_id (priv->goa_client, account_id);
-    }
-  } else {
-    g_warning ("Failed to create the authentication dialog: %s\n", error->message);
-  }
-
-  /* login dialog was dismissed */
-  if (goa_object == NULL) {
-    gtk_widget_set_sensitive (priv->setup_button, TRUE);
-    goto out;
-  }
-
-  priv->goa_account = goa_object_get_account (goa_object);
-  goa_account_store (account_id);
-
-  /* retrieve livepatch token */
-  password_based = goa_object_peek_password_based (goa_object);
-
-  goa_password_based_call_get_password (password_based,
-                                        "livepatch",
-                                        NULL /* cancellable */,
-                                        on_livepatch_token_ready,
-                                        page);
- out:
-  g_clear_pointer (&dialog, gtk_widget_destroy);
-  g_clear_object (&goa_object);
-}
-
-static void
-on_livepatch_permission_acquired (GObject      *source,
-                                  GAsyncResult *res,
-                                  gpointer      data)
-{
-  GisLivepatchPage *page = GIS_LIVEPATCH_PAGE (data);
-  GisLivepatchPagePrivate *priv = gis_livepatch_page_get_instance_private (page);
-  g_autoptr(GError) error = NULL;
-  gboolean allowed;
-
-  allowed = g_permission_acquire_finish (priv->permission, res, &error);
-  if (error) {
-      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        g_warning ("Failed to acquire permission: %s", error->message);
-      else
-        gtk_widget_set_sensitive (priv->setup_button, TRUE);
-      return;
-  }
-
-  if (allowed)
-    login_and_enable_livepatch (page);
-}
-
-static void
-on_setup_button_clicked (GtkButton *button,
-                         gpointer  data)
-{
-  GisLivepatchPage *page = GIS_LIVEPATCH_PAGE (data);
-  GisLivepatchPagePrivate *priv = gis_livepatch_page_get_instance_private (page);
-
-  gtk_widget_set_sensitive (priv->setup_button, FALSE);
-
-  if (G_IS_PERMISSION (priv->permission) && g_permission_get_allowed (priv->permission)) {
-    login_and_enable_livepatch (page);
-  }
-  else if (G_IS_PERMISSION (priv->permission)  && g_permission_get_can_acquire (priv->permission)) {
-    g_permission_acquire_async (priv->permission,
-                                NULL,
-                                on_livepatch_permission_acquired,
-                                page);
-  } else {
-     g_warning ("Could not start the attempt to acquire the permission to enable Livepatch. Fallback to per-app policy.");
-     login_and_enable_livepatch (page);
-  }
-}
-
-static void
-on_signout_button_clicked (GtkButton        *button,
-                           GisLivepatchPage *page)
-{
-  GisLivepatchPagePrivate *priv = gis_livepatch_page_get_instance_private (page);
-
-  /* disable livepatch */
-  priv->user_current_choice = FALSE;
-  if (!priv->waiting_for_livepatch_response && is_livepatch_enabled ())
-    set_livepatch_enabled (page, FALSE);
-
-  goa_account_store ("");
-  /* remove GoaAccount from system */
-  goa_account_call_remove (priv->goa_account, NULL, NULL, NULL);
-
-  /* reset the GUI */
-  gtk_widget_set_sensitive (priv->setup_button, TRUE);
-  gtk_widget_set_visible (priv->message_box, FALSE);
-
-  g_clear_object (&priv->goa_account);
-  g_clear_pointer (&priv->token, g_free);
-}
-
-static void
-show_legal (GtkButton *button, GisLivepatchPage *page)
-{
-  g_autofree gchar *buffer = NULL;
-  g_autofree gchar *privacy_policy = NULL;
-  g_autoptr(GError) error = NULL;
-
-  if (g_file_get_contents ("/etc/os-release", &buffer, NULL, NULL))
-    privacy_policy = get_item (buffer, "PRIVACY_POLICY_URL");
-
-  if (!gtk_show_uri_on_window (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (page))),
-                               privacy_policy,
-                               GDK_CURRENT_TIME, &error)) {
-    GtkWidget *dialog;
-    dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (page))),
-                                     GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                     GTK_MESSAGE_ERROR,
-                                     GTK_BUTTONS_CLOSE,
-                                     _("Failed to show Livepatch policy: %s"), error->message);
-    gtk_dialog_run (GTK_DIALOG (dialog));
-    gtk_widget_destroy (dialog);
-    return;
-  }
-}
-
-static void
-gis_livepatch_page_constructed (GObject *object)
-{
-  GisLivepatchPage *page = GIS_LIVEPATCH_PAGE (object);
-  GisLivepatchPagePrivate *priv = gis_livepatch_page_get_instance_private (page);
-  g_autoptr(GError) error = NULL;
-
-  G_OBJECT_CLASS (gis_livepatch_page_parent_class)->constructed (object);
-
-  gis_page_set_skippable (GIS_PAGE (page), TRUE);
-
-  priv->goa_client = goa_client_new_sync (NULL, &error);
-
-  if (priv->goa_client == NULL) {
-    g_error ("Failed to get a GoaClient: %s", error->message);
-    return;
-  }
-
-  priv->permission = polkit_permission_new_sync ("com.ubuntu.welcome.livepatch", NULL, NULL, &error);
-  if (priv->permission == NULL) {
-    g_warning ("Could not get 'com.ubuntu.welcome.livepatch' permission: %s",
-                error->message);
-  }
-
-  g_signal_connect (priv->setup_button, "clicked",
-                    G_CALLBACK (on_setup_button_clicked), page);
-
-  g_signal_connect (priv->signout_button, "clicked",
-                    G_CALLBACK (on_signout_button_clicked), page);
-
-  gis_page_set_complete (GIS_PAGE (page), TRUE);
-  gtk_widget_show (GTK_WIDGET (page));
-}
-
-static void
-gis_livepatch_page_dispose (GObject *object)
-{
-  GisLivepatchPage *page = GIS_LIVEPATCH_PAGE (object);
-  GisLivepatchPagePrivate *priv = gis_livepatch_page_get_instance_private (page);
-
-  g_clear_object (&priv->goa_client);
-  g_clear_object (&priv->goa_account);
-  g_clear_object (&priv->permission);
-  g_clear_pointer (&priv->token, g_free);
-
-  G_OBJECT_CLASS (gis_livepatch_page_parent_class)->dispose (object);
-}
-
-static void
-gis_livepatch_page_locale_changed (GisPage *page)
-{
-  gis_page_set_title (GIS_PAGE (page), _("Livepatch"));
-}
-
-static void
-gis_livepatch_page_class_init (GisLivepatchPageClass *klass)
-{
-  GisPageClass *page_class = GIS_PAGE_CLASS (klass);
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/initial-setup/gis-livepatch-page.ui");
-
-  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisLivepatchPage, setup_button);
-  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisLivepatchPage, message_box);
-  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisLivepatchPage, signout_button);
-  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisLivepatchPage, message_label);
-  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), show_legal);
-
-
-  page_class->page_id = PAGE_ID;
-  page_class->locale_changed = gis_livepatch_page_locale_changed;
-  object_class->constructed = gis_livepatch_page_constructed;
-  object_class->dispose = gis_livepatch_page_dispose;
-}
-
-static void
-gis_livepatch_page_init (GisLivepatchPage *page)
-{
-  g_resources_register (livepatch_get_resource ());
-
-  gtk_widget_init_template (GTK_WIDGET (page));
-}
-
-GisPage *
-gis_prepare_livepatch_page (GisDriver *driver)
-{
-  if (is_livepatch_enabled () || !is_livepatch_supported ())
-    return NULL;
-
-  return g_object_new (GIS_TYPE_LIVEPATCH_PAGE,
-                       "driver", driver,
-                       NULL);
-}
diff --git a/gnome-initial-setup/pages/livepatch/gis-livepatch-page.h b/gnome-initial-setup/pages/livepatch/gis-livepatch-page.h
deleted file mode 100644
index 3356dbe..0000000
--- a/gnome-initial-setup/pages/livepatch/gis-livepatch-page.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
- * Copyright (C) 2018 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GIS_LIVEPATCH_PAGE_H__
-#define __GIS_LIVEPATCH_PAGE_H__
-
-#include "gnome-initial-setup.h"
-
-G_BEGIN_DECLS
-
-#define GIS_TYPE_LIVEPATCH_PAGE            (gis_livepatch_page_get_type ())
-#define GIS_LIVEPATCH_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIS_TYPE_LIVEPATCH_PAGE, GisLivepatchPage))
-#define GIS_LIVEPATCH_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIS_TYPE_LIVEPATCH_PAGE, GisLivepatchPageClass))
-#define GIS_IS_LIVEPATCH_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIS_TYPE_LIVEPATCH_PAGE))
-#define GIS_IS_LIVEPATCH_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIS_TYPE_LIVEPATCH_PAGE))
-#define GIS_LIVEPATCH_PAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIS_TYPE_LIVEPATCH_PAGE, GisLivepatchPageClass))
-
-typedef struct _GisLivepatchPage        GisLivepatchPage;
-typedef struct _GisLivepatchPageClass   GisLivepatchPageClass;
-
-struct _GisLivepatchPage
-{
-  GisPage parent;
-};
-
-struct _GisLivepatchPageClass
-{
-  GisPageClass parent_class;
-};
-
-GType gis_livepatch_page_get_type (void);
-
-GisPage *gis_prepare_livepatch_page (GisDriver *driver);
-
-G_END_DECLS
-
-#endif /* __GIS_LIVEPATCH_PAGE_H__ */
diff --git a/gnome-initial-setup/pages/livepatch/gis-livepatch-page.ui b/gnome-initial-setup/pages/livepatch/gis-livepatch-page.ui
deleted file mode 100644
index c877ff5..0000000
--- a/gnome-initial-setup/pages/livepatch/gis-livepatch-page.ui
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <template class="GisLivepatchPage" parent="GisPage">
-    <child>
-      <object class="GtkGrid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="row_spacing">40</property>
-	<property name="border_width">20</property>
-        <child>
-          <object class="GtkLabel" id="title">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">start</property>
-            <property name="valign">start</property>
-            <property name="label" translatable="yes">Livepatch</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-              <attribute name="scale" value="1.8"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">3</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkImage" id="icon_image">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="valign">start</property>
-            <property name="halign">start</property>
-            <property name="resource">/org/gnome/initial-setup/livepatch.svg</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="right_padding_label">
-            <property name="visible">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-	    <property name="halign">center</property>
-	    <property name="hexpand">True</property>
-	    <property name="valign">start</property>
-	    <property name="vexpand">True</property>
-	    <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="max-width-chars">50</property>
-                <property name="xalign">0</property>
-                <property name="halign">start</property>
-                <property name="label" translatable="yes">Canonical Livepatch helps keep your computer secure, by applying some updates that would normally require restarting.</property>
-                <property name="wrap">True</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="margin_top">18</property>
-                <property name="label" translatable="yes">Would you like to set up Livepatch now?</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin_top">18</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkButton" id="setup_button">
-                    <property name="visible">True</property>
-                    <property name="halign">start</property>
-                    <property name="label" translatable="yes">Set Up Livepatch…</property>
-                    <style>
-                      <class name="suggested-action"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Legal notice</property>
-                    <signal name="clicked" handler="show_legal"/>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox" id="message_box">
-                <property name="visible">False</property>
-                <property name="can_focus">False</property>
-                <property name="halign">fill</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin_top">18</property>
-                <child>
-                  <object class="GtkLabel" id="message_label">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton" id="signout_button">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Sign Out</property>
-                  </object>
-                  <packing>
-                    <property name="pack-type">end</property>
-                  </packing>
-                </child>
-	      </object>
-	    </child>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </template>
-  <object class="GtkSizeGroup">
-    <property name="mode">horizontal</property>
-    <widgets>
-      <widget name="icon_image"/>
-      <widget name="right_padding_label"/>
-    </widgets>
-  </object>
-</interface>
diff --git a/gnome-initial-setup/pages/livepatch/livepatch.gresource.xml b/gnome-initial-setup/pages/livepatch/livepatch.gresource.xml
deleted file mode 100644
index 5678958..0000000
--- a/gnome-initial-setup/pages/livepatch/livepatch.gresource.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/initial-setup">
-    <file preprocess="xml-stripblanks" alias="gis-livepatch-page.ui">gis-livepatch-page.ui</file>
-    <file preprocess="xml-stripblanks" alias="gis-auth-dialog.ui">gis-auth-dialog.ui</file>
-    <file alias="livepatch.svg">livepatch.svg</file>
-  </gresource>
-</gresources>
-
diff --git a/gnome-initial-setup/pages/livepatch/livepatch.svg b/gnome-initial-setup/pages/livepatch/livepatch.svg
deleted file mode 100644
index a84bcd6..0000000
--- a/gnome-initial-setup/pages/livepatch/livepatch.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0px" y="0px" width="150px" height="150px" viewBox="0 0 400 400" style="enable-background:new 0 0 400 400;" xml:space="preserve"> <style type="text/css"> .st0{fill:#666666; fill-opacity:0.25;} </style> <g> <path class="st0" d="M73.7,168.4c0-69.7,56.7-126.3,126.3-126.3c69.7,0,126.3,56.7,126.3,126.3h42.1C368.4,75.6,292.9,0,200,0 C107.1,0,31.6,75.6,31.6,168.4v63.7h0C31.9,324.8,107.3,400,200,400c92.9,0,168.4-75.6,168.4-168.4v-21.1H73.7V168.4L73.7,168.4z M200,242.1c17.4,0,31.6,14.1,31.6,31.6c0,13.7-8.8,25.4-21,29.7v54.4c0,5.8-4.7,10.5-10.5,10.5s-10.5-4.7-10.5-10.5v-54.4 c-12.3-4.3-21.1-16-21.1-29.8C168.4,256.3,182.6,242.1,200,242.1L200,242.1z"/> </g> </svg>
diff --git a/gnome-initial-setup/pages/livepatch/meson.build b/gnome-initial-setup/pages/livepatch/meson.build
deleted file mode 100644
index 14d89ed..0000000
--- a/gnome-initial-setup/pages/livepatch/meson.build
+++ /dev/null
@@ -1,12 +0,0 @@
-sources += gnome.compile_resources(
-    'livepatch-resources',
-    files('livepatch.gresource.xml'),
-    c_name: 'livepatch'
-)
-
-sources += files(
-    'gis-livepatch-page.c',
-    'gis-livepatch-page.h',
-    'gis-auth-dialog.c',
-    'gis-auth-dialog.h',
-)
diff --git a/gnome-initial-setup/pages/meson.build b/gnome-initial-setup/pages/meson.build
index 32f615b..2767094 100644
--- a/gnome-initial-setup/pages/meson.build
+++ b/gnome-initial-setup/pages/meson.build
@@ -10,8 +10,8 @@ pages = [
    'software',
    'summary',
    'welcome',
+   'ubuntu-pro',
    'ubuntu-report',
-   'livepatch',
    'apps',
 ]
 
diff --git a/gnome-initial-setup/pages/ubuntu-pro/checkmark.svg b/gnome-initial-setup/pages/ubuntu-pro/checkmark.svg
new file mode 100644
index 0000000..a0c8602
--- /dev/null
+++ b/gnome-initial-setup/pages/ubuntu-pro/checkmark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" fill-rule="nonzero"><path fill="#0e8420" d="M8 1a7 7 0 110 14A7 7 0 018 1zm2.83 3.502L6.863 9.884 5.174 8.096l-1.09 1.03 2.92 3.096 5.034-6.83-1.208-.89z"/><path fill="#fff" d="M10.83 4.502l1.208.89-5.033 6.83-2.922-3.096 1.091-1.03 1.689 1.789z"/></g></svg>
\ No newline at end of file
diff --git a/gnome-initial-setup/pages/ubuntu-pro/fail.svg b/gnome-initial-setup/pages/ubuntu-pro/fail.svg
new file mode 100644
index 0000000..e3c9a52
--- /dev/null
+++ b/gnome-initial-setup/pages/ubuntu-pro/fail.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><defs><filter id="darkreader-image-filter"><feColorMatrix type="matrix" values="-0.193 -0.490 -1.120 0.000 1.698 -0.965 0.293 -1.105 0.000 1.673 -0.946 -0.489 -0.296 0.000 1.630 0.000 0.000 0.000 1.000 0.000"/></filter></defs><image width="16" height="16" filter="url(#darkreader-image-filter)" xlink:href="data:image/svg+xml,%3Csvg width='16' height='16' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='none' fill-rule='evenodd'%3E%3Ccircle stroke='%23c7162b' stroke-width='1.5' fill='%23c7162b' cx='8' cy='8' r='6.25'/%3E%3Cpath fill='%23FFF' fill-rule='nonzero' d='M10.282 4.638l1.06 1.06L9.05 7.99l2.293 2.292-1.06 1.06L7.99 9.05 5.7 11.343l-1.06-1.06 2.29-2.293L4.64 5.7l1.06-1.06 2.291 2.29z'/%3E%3C/g%3E%3C/svg%3E"/></svg>
\ No newline at end of file
diff --git a/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-attach-page.ui b/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-attach-page.ui
new file mode 100644
index 0000000..930d4b7
--- /dev/null
+++ b/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-attach-page.ui
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <template class="GisUbuntuProAttachPage" parent="GtkBin">
+  <child>
+  <object class="GtkBox" id="attach_page">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="no-show-all">True</property>
+    <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
+            <property name="margin-top">3</property>
+            <property name="margin-bottom">0</property>
+            <property name="label" translatable="yes">&lt;b&gt;Enable Ubuntu Pro&lt;/b&gt;</property>
+            <property name="use-markup">True</property>
+            <property name="wrap">True</property>
+            <property name="xalign">0</property>
+            <attributes>
+              <attribute name="scale" value="1.4"/>
+            </attributes>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="margin-top">10</property>
+            <property name="margin-bottom">10</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkEventBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="margin-top">12</property>
+            <property name="margin-bottom">12</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <child>
+                  <object class="GtkImage" id="ubuntu_pro_logo">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-left">30</property>
+                    <property name="margin-right">30</property>
+                    <property name="yalign">0</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="margin-right">30</property>
+                    <property name="label" translatable="yes">Upgrade this machine to Ubuntu Pro for security updates on a much wider range of packages, until 2032. Fulfill FedRAMP, FIPS, STIG and HIPAA and other compliance and hardening requirements with certified tooling and crypto-modules. Free up to 5 machines.
+
+More information on &lt;a href="https://ubuntu.com/pro"&gt;ubuntu.com/pro&lt;/a&gt;.</property>
+                    <property name="use-markup">True</property>
+                    <property name="wrap">True</property>
+                    <property name="max-width-chars">130</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkRadioButton" id="magic_radio">
+            <property name="label" translatable="yes">Enter code on ubuntu.com/pro/attach</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="margin-top">40</property>
+            <property name="margin-bottom">6</property>
+            <property name="margin-left">30</property>
+            <property name="xalign">0</property>
+            <property name="group">magic_radio</property>
+            <signal name="clicked" handler="on_magic_clicked" swapped="no"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="margin-left">30</property>
+            <child>
+              <object class="GtkLabel" id="pin_label">
+                <property name="selectable">True</property>
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="margin-top">8</property>
+                <property name="margin-bottom">8</property>
+                <property name="halign">start</property>
+                <property name="margin-left">32</property>
+                <attributes>
+                  <attribute name="scale" value="2"/>
+                </attributes>
+              </object>
+            </child>
+            <child>
+              <object class="GtkFixed">
+                <property name="visible">True</property>
+                <property name="valign">center</property>
+                <property name="margin-left">12</property>
+                <property name="margin-right">6</property>
+                <child>
+                  <object class="GtkSpinner" id="pin_spinner">
+                    <property name="visible">True</property>
+                    <property name="valign">center</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkImage" id="pin_status_icon">
+                    <property name="visible">False</property>
+                    <property name="valign">center</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="pin_status">
+                <property name="visible">True</property>
+                <property name="use-markup">True</property>
+                <property name="halign">start</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="pin_hint">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="margin-top">6</property>
+            <property name="margin-bottom">8</property>
+            <property name="halign">start</property>
+            <property name="margin-left">62</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkRadioButton" id="token_radio">
+            <property name="label" translatable="yes">Or add token manually</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="margin-left">30</property>
+            <property name="margin-top">20</property>
+            <property name="xalign">0</property>
+            <property name="group">magic_radio</property>
+            <signal name="toggled" handler="on_radio_toggled" swapped="no"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="no-show-all">True</property>
+            <property name="margin-left">62</property>
+            <property name="margin-top">12</property>
+            <property name="margin-bottom">12</property>
+            <child>
+              <object class="GtkEntry" id="token_field">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can-focus">True</property>
+                <property name="width-chars">35</property>
+                <property name="placeholder-text" translatable="yes">Token</property>
+                <property name="valign">center</property>
+                <signal name="activate" handler="request_token_attach" swapped="no"/>
+                <signal name="changed" handler="on_token_typing" swapped="no"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkFixed">
+                <property name="visible">True</property>
+                <property name="valign">center</property>
+                <property name="margin">6</property>
+                <child>
+                  <object class="GtkSpinner" id="token_spinner">
+                    <property name="visible">True</property>
+                    <property name="valign">center</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkImage" id="token_status_icon">
+                    <property name="visible">False</property>
+                    <property name="valign">center</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="token_status">
+                <property name="visible">True</property>
+                <property name="valign">center</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">From your admin, or from ubuntu.com/pro</property>
+            <property name="margin-left">62</property>
+            <property name="halign">start</property>
+          </object>
+        </child>
+  </object>
+  </child>
+</template>
+</interface>
diff --git a/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-offer-page.ui b/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-offer-page.ui
new file mode 100644
index 0000000..baf941e
--- /dev/null
+++ b/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-offer-page.ui
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <template class="GisUbuntuProOfferPage" parent="GtkBin">
+    <child>
+      <object class="GtkBox" id="offer_page">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="no-show-all">True</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
+            <property name="margin-top">3</property>
+            <property name="margin-bottom">0</property>
+            <property name="label" translatable="yes">&lt;b&gt;Enable Ubuntu Pro&lt;/b&gt;</property>
+            <property name="use-markup">True</property>
+            <property name="wrap">True</property>
+            <property name="xalign">0</property>
+            <attributes>
+              <attribute name="scale" value="1.4"/>
+            </attributes>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="margin-top">10</property>
+            <property name="margin-bottom">10</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkEventBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="margin-top">12</property>
+            <property name="margin-bottom">12</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <child>
+                  <object class="GtkImage" id="ubuntu_pro_logo">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-left">30</property>
+                    <property name="margin-right">30</property>
+                    <property name="yalign">0</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="margin-right">30</property>
+                    <property name="label" translatable="yes">Upgrade this machine to Ubuntu Pro for security updates on a much wider range of packages, until 2032. Fulfill FedRAMP, FIPS, STIG and HIPAA and other compliance and hardening requirements with certified tooling and crypto-modules. Free up to 5 machines.
+
+More information on &lt;a href="https://ubuntu.com/pro"&gt;ubuntu.com/pro&lt;/a&gt;.</property>
+                    <property name="use-markup">True</property>
+                    <property name="wrap">True</property>
+                    <property name="max-width-chars">130</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="margin-top">40</property>
+            <property name="margin-bottom">6</property>
+            <property name="margin-left">30</property>
+            <property name="label" translatable="yes">Enable Ubuntu Pro for this installation or skip this step.</property>
+            <property name="xalign">0</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="orientation">vertical</property>
+            <property name="margin-left">30</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="orientation">horizontal</property>
+                <child>
+                  <object class="GtkRadioButton" id="enable_pro_select">
+                    <property name="label" translatable="yes">Enable Ubuntu Pro</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="margin-top">6</property>
+                    <property name="xalign">0</property>
+                    <property name="draw-indicator">True</property>
+                    <property name="group">skip_pro_select</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkImage" id="pro_status_image">
+                    <property name="can-focus">False</property>
+                    <property name="stock">gtk-dialog-warning</property>
+                    <property name="icon_size">2</property>
+                    <property name="margin-left">30</property>
+                    <property name="margin-right">6</property>
+                    <property name="yalign">0.7</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="offline_warning">
+                    <property name="yalign">0.8</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes">An internet connection is required to enable Ubuntu Pro</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkRadioButton" id="skip_pro_select">
+                    <property name="label" translatable="yes">Skip for now</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="margin-top">12</property>
+                    <property name="xalign">0</property>
+                    <property name="active">True</property>
+                    <property name="draw-indicator">True</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkAlignment">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="left-padding">25</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="label" translatable="yes">&lt;small&gt;You can always enable Ubuntu Pro later via the 'pro attach' command&lt;/small&gt;</property>
+                        <property name="use-markup">True</property>
+                        <property name="xalign">0</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-page.c b/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-page.c
new file mode 100644
index 0000000..adc4ab2
--- /dev/null
+++ b/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-page.c
@@ -0,0 +1,804 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 2022 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Canonical Ubuntu Pro page {{{1 */
+
+#define PAGE_ID "UbuntuPro"
+#define CHECK_ICON "/org/gnome/initial-setup/checkmark.svg"
+#define FAIL_ICON  "/org/gnome/initial-setup/fail.svg"
+#define LOGO       "/org/gnome/initial-setup/ubuntu-pro.svg"
+#define LOGO_DARK  "/org/gnome/initial-setup/ubuntu-pro-dark.svg"
+
+#include "config.h"
+#include "gis-ubuntupro-page.h"
+#include "ubuntupro-resources.h"
+#include "utils.h"
+
+#include <glib/gi18n.h>
+#include <gio/gio.h>
+#include <polkit/polkit.h>
+#include <json-glib/json-glib.h>
+#include <time.h>
+#include <pthread.h>
+
+static gboolean SuccessfullyAttached = FALSE;
+
+typedef enum {
+  NONE = 0,
+  SUCCESS,
+  FAIL,
+  EXPIRED,
+} status_t;
+
+struct _GisUbuntuProPagePrivate {
+  GtkWidget *offer_page;
+  GtkWidget *attach_page;
+  GtkWidget *services_page;
+  GtkWidget *stack;
+
+  enum {
+      OFFER_PAGE,
+      ATTACH_PAGE,
+      SERVICES_PAGE,
+  } current_page;
+};
+typedef struct _GisUbuntuProPagePrivate GisUbuntuProPagePrivate;
+
+struct _GisUbuntuProOfferPagePrivate {
+  GtkWidget *ubuntu_pro_logo;
+  GtkWidget *enable_pro_select;
+  GtkWidget *skip_pro_select;
+  GtkWidget *offline_warning;
+  GtkWidget *pro_status_image;
+  gint      network_cb;
+};
+typedef struct _GisUbuntuProOfferPagePrivate GisUbuntuProOfferPagePrivate;
+
+struct _GisUbuntuProAttachPagePrivate {
+  GtkWidget *ubuntu_pro_logo;
+  GtkWidget *pin_label;
+  GtkWidget *token_field;
+  GtkWidget *token_status;
+  GtkWidget *token_spinner;
+  GtkWidget *pin_spinner;
+  GtkWidget *token_status_icon;
+  GtkWidget *pin_hint;
+  GtkWidget *pin_status;
+  GtkWidget *pin_status_icon;
+  GtkWidget *token_radio;
+  GtkWidget *magic_radio;
+  /* This being here is a hack that makes changing the 2nd page's button
+   * from Skip to Next once the machine is attached possible. */
+  GisUbuntuProPage *main_page;
+
+  gboolean complete;
+  gboolean magic_token_polling;
+  gboolean attaching;
+  gint64 expired_by;
+  pthread_t poll_id;
+  enum active_radio_t {
+    MAGIC,
+    TOKEN,
+  } active_radio;
+  gchar *contract_token;
+  gchar *token;
+};
+typedef struct _GisUbuntuProAttachPagePrivate GisUbuntuProAttachPagePrivate;
+
+struct _GisUbuntuProServicesPagePrivate {
+  GtkWidget *enabled_services;
+  GtkWidget *enabled_services_header;
+  GtkWidget *available_services;
+  GtkWidget *available_services_header;
+  GtkWidget *contract_name;
+  GtkWidget *checkmark;
+};
+typedef struct _GisUbuntuProServicesPagePrivate GisUbuntuProServicesPagePrivate;
+
+struct _RestJSONResponse {
+    gint64 expiresIn;
+    gchar *token;
+    gchar *code;
+    gchar *contract_token;
+};
+
+typedef struct _RestJSONResponse RestJSONResponse;
+static void ua_attach(const gchar *, GisUbuntuProAttachPagePrivate *);
+static gboolean magic_parser(gchar*, RestJSONResponse*);
+static gboolean gis_ubuntupro_page_apply (GisPage*, GCancellable*);
+
+G_DEFINE_TYPE_WITH_PRIVATE (GisUbuntuProPage, gis_ubuntupro_page, GIS_TYPE_PAGE);
+G_DEFINE_TYPE_WITH_PRIVATE (GisUbuntuProOfferPage, gis_ubuntupro_offer_page, GTK_TYPE_BIN);
+G_DEFINE_TYPE_WITH_PRIVATE (GisUbuntuProAttachPage, gis_ubuntupro_attach_page, GTK_TYPE_BIN);
+G_DEFINE_TYPE_WITH_PRIVATE (GisUbuntuProServicesPage, gis_ubuntupro_services_page, GTK_TYPE_BIN);
+
+static void
+map_scalable_image(const gchar *path, GtkImage *widget, int x, int y)
+{
+  g_autoptr(GError) error = NULL;
+  GdkPixbuf *pixbuf;
+  pixbuf = gdk_pixbuf_new_from_resource_at_scale (path, x, y, TRUE, &error);
+  if (error) {
+    g_warning("Unable to create pixbuf: %s\n", error->message);
+  }
+
+  if (pixbuf != NULL) {
+    gtk_image_set_from_pixbuf(widget, pixbuf);
+  } else {
+    g_warning("Unable to load pixbuf: %s\n", error->message);
+  }
+}
+
+/* The user may go back any number of pages during attachment, so we can't
+ * blindly skip to the services list page.
+ * Furthermore, after attachment the user can again navigate back to any page
+ * and then hit the attach page again.
+ */
+static void
+consider_going_to_next_page(GisUbuntuProAttachPagePrivate *priv)
+{
+  static gboolean never_called = TRUE;
+  GisUbuntuProPage *page = GIS_UBUNTUPRO_PAGE(priv->main_page);
+  GisUbuntuProPagePrivate *main_priv = gis_ubuntupro_page_get_instance_private (page);
+
+  if (never_called && main_priv->current_page == ATTACH_PAGE) {
+    gis_page_set_complete(GIS_PAGE(priv->main_page), TRUE);
+    gis_ubuntupro_page_apply(GIS_PAGE(priv->main_page), NULL);
+  }
+  never_called = FALSE;
+}
+
+static void
+update_gui(GisUbuntuProAttachPagePrivate *priv, status_t status)
+{
+  GtkWidget *label, *icon, *spinner;
+  gchar *hint = _("Attach machine via your Ubuntu One account");
+  gboolean ready_to_attach;
+
+  if (priv->active_radio == MAGIC) {
+    icon = priv->pin_status_icon;
+    label = priv->pin_status;
+    spinner = priv->pin_spinner;
+    ready_to_attach = SuccessfullyAttached ||
+        (priv->contract_token && !priv->attaching);
+  } else {
+    icon = priv->token_status_icon;
+    label = priv->token_status;
+    spinner = priv->token_spinner;
+    ready_to_attach = SuccessfullyAttached || (!priv->attaching &&
+        gtk_entry_get_text_length(GTK_ENTRY(priv->token_field)) > 0);
+  }
+  gis_page_set_complete(GIS_PAGE(priv->main_page), ready_to_attach);
+
+  if (priv->attaching) {
+    gtk_spinner_start (GTK_SPINNER (spinner));
+  } else {
+    gtk_spinner_stop (GTK_SPINNER (spinner));
+  }
+
+  gtk_widget_set_sensitive (priv->token_radio, !priv->attaching);
+  gtk_widget_set_sensitive (priv->magic_radio, !priv->attaching);
+  gtk_widget_set_sensitive (priv->token_field, !priv->attaching &&
+                            priv->active_radio == TOKEN);
+
+  if (SuccessfullyAttached) {
+    consider_going_to_next_page(priv);
+    status = SUCCESS;
+  }
+  switch (status) {
+  case SUCCESS:
+    gtk_label_set_markup(GTK_LABEL(label), g_strconcat(
+        "<span foreground=\"green\"><b>", _("Valid token"), "</b></span>", NULL
+    ));
+    gtk_image_set_from_resource(GTK_IMAGE(icon), CHECK_ICON);
+    gtk_widget_set_sensitive(GTK_WIDGET(priv->token_field), FALSE);
+    gtk_widget_set_sensitive(GTK_WIDGET(priv->magic_radio), FALSE);
+    gtk_widget_set_sensitive(GTK_WIDGET(priv->token_radio), FALSE);
+    break;
+  case FAIL:
+    gtk_label_set_markup(GTK_LABEL(label), g_strconcat(
+        "<span foreground=\"red\"><b>", _("Invalid token"), "</b></span>", NULL
+    ));
+    gtk_image_set_from_resource(GTK_IMAGE(icon), FAIL_ICON);
+    break;
+  case EXPIRED:
+    hint = "Click the button to generate a new code.";
+    gtk_label_set_markup(GTK_LABEL(label), _("Code expired"));
+    gtk_image_set_from_resource(GTK_IMAGE(icon), FAIL_ICON);
+    break;
+  default:
+    break;
+  }
+  gtk_label_set_text(GTK_LABEL(priv->pin_hint), hint);
+  gtk_widget_set_visible(GTK_WIDGET(priv->token_status_icon), FALSE);
+  gtk_widget_set_visible(GTK_WIDGET(priv->token_status), FALSE);
+  gtk_widget_set_visible(GTK_WIDGET(priv->pin_status_icon), FALSE);
+  gtk_widget_set_visible(GTK_WIDGET(priv->pin_status), FALSE);
+  gtk_widget_set_visible(GTK_WIDGET(icon), status);
+  gtk_widget_set_visible(GTK_WIDGET(label), status);
+}
+
+static void
+network_status_changed (GNetworkMonitor *monitor,
+                        gboolean         available,
+                        gpointer         user_data)
+{
+  GisUbuntuProOfferPagePrivate *priv = user_data;
+
+  if (!available) {
+    gtk_widget_set_sensitive (priv->enable_pro_select, FALSE);
+    gtk_widget_show (GTK_WIDGET (priv->offline_warning));
+    gtk_widget_show (GTK_WIDGET (priv->pro_status_image));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->skip_pro_select), TRUE);
+    gtk_image_set_from_icon_name (GTK_IMAGE(priv->pro_status_image), "gtk-dialog-warning", GTK_ICON_SIZE_DND);
+  }
+  else {
+    gtk_widget_set_sensitive (priv->enable_pro_select, TRUE);
+    gtk_widget_hide (GTK_WIDGET (priv->offline_warning));
+    gtk_widget_hide (GTK_WIDGET (priv->pro_status_image));
+  }
+}
+
+static void
+gis_ubuntupro_page_dispose (GObject *object)
+{
+  GisUbuntuProPage *page = GIS_UBUNTUPRO_PAGE (object);
+  GisUbuntuProPagePrivate *priv = gis_ubuntupro_page_get_instance_private (page);
+  GisUbuntuProOfferPage *offer_page = GIS_UBUNTUPRO_OFFER_PAGE (priv->offer_page);
+  GisUbuntuProOfferPagePrivate *offer_priv = gis_ubuntupro_offer_page_get_instance_private (offer_page);
+
+  GNetworkMonitor *network_monitor = g_network_monitor_get_default ();
+  g_signal_handler_disconnect(network_monitor, offer_priv->network_cb);
+
+  G_OBJECT_CLASS (gis_ubuntupro_page_parent_class)->dispose (object);
+}
+
+static void
+gis_ubuntupro_page_constructed (GObject *object)
+{
+  GisUbuntuProPage *page = GIS_UBUNTUPRO_PAGE (object);
+  GisUbuntuProPagePrivate *priv = gis_ubuntupro_page_get_instance_private (page);
+  GisUbuntuProOfferPage *offer_page = GIS_UBUNTUPRO_OFFER_PAGE (priv->offer_page);
+  GisUbuntuProOfferPagePrivate *offer_priv = gis_ubuntupro_offer_page_get_instance_private (offer_page);
+  GisUbuntuProAttachPage *attach_page = GIS_UBUNTUPRO_ATTACH_PAGE (priv->attach_page);
+  GisUbuntuProAttachPagePrivate *attach_priv = gis_ubuntupro_attach_page_get_instance_private (attach_page);
+  GisUbuntuProServicesPage *services_page = GIS_UBUNTUPRO_SERVICES_PAGE(priv->services_page);
+  GisUbuntuProServicesPagePrivate *services_priv = gis_ubuntupro_services_page_get_instance_private (services_page);
+
+  gchar *logo = is_dark_theme(GTK_WIDGET(page)) ? LOGO_DARK: LOGO;
+  map_scalable_image(logo, GTK_IMAGE(attach_priv->ubuntu_pro_logo), -1, 66);
+  map_scalable_image(logo, GTK_IMAGE(offer_priv->ubuntu_pro_logo), -1, 66);
+  map_scalable_image(CHECK_ICON, GTK_IMAGE(services_priv->checkmark), 30, -1);
+
+  G_OBJECT_CLASS (gis_ubuntupro_page_parent_class)->constructed (object);
+
+  GNetworkMonitor *network_monitor = g_network_monitor_get_default ();
+  offer_priv->network_cb = g_signal_connect (network_monitor, "network-changed",
+                    G_CALLBACK (network_status_changed), priv);
+
+  if (!g_network_monitor_get_network_available (network_monitor)) {
+    gtk_widget_set_sensitive (offer_priv->enable_pro_select, FALSE);
+    gtk_widget_show (GTK_WIDGET (offer_priv->offline_warning));
+    gtk_widget_show (GTK_WIDGET (offer_priv->pro_status_image));
+  }
+
+  /* Initializate priv values */
+  attach_priv->magic_token_polling = FALSE;
+  attach_priv->active_radio = MAGIC;
+  attach_priv->expired_by = 0;
+  attach_priv->contract_token = NULL;
+  attach_priv->main_page = page;
+  priv->current_page = OFFER_PAGE;
+
+  gis_page_set_skippable (GIS_PAGE (page), FALSE);
+  gis_page_set_complete (GIS_PAGE (page), TRUE);
+  gtk_widget_show (GTK_WIDGET (page));
+}
+
+static void
+gis_ubuntupro_page_locale_changed (GisPage *page)
+{
+  gis_page_set_title (GIS_PAGE (page), _("Ubuntu Pro"));
+}
+
+static gboolean
+poll_token_attach (GisUbuntuProAttachPagePrivate *priv)
+{
+  gchar *std_out, *std_err, *cmd;
+  RestJSONResponse resp; /* relevant response fields */
+  g_autoptr(GError) error = NULL;
+
+  cmd = g_strconcat("/bin/ua api u.pro.attach.magic.wait.v1 --args magic_token=", priv->token, NULL);
+  if (!g_spawn_command_line_sync(cmd, &std_out, &std_err, NULL, &error)) {
+    g_warning ("Failed to request magic token: %s", error->message);
+  }
+  else if (!magic_parser(std_out, &resp)) {
+    g_warning("Couldn't parse response.");
+  }
+  else if (resp.contract_token != NULL) {
+    priv->contract_token = g_strdup(resp.contract_token);
+    return TRUE;
+  }
+  return FALSE;
+}
+
+static void*
+poll_magic_token (void *data)
+{
+  GisUbuntuProAttachPagePrivate *priv = gis_ubuntupro_attach_page_get_instance_private (data);
+  status_t status;
+
+  if (priv->active_radio != MAGIC) {
+    pthread_exit(NULL);
+  }
+  priv->magic_token_polling = TRUE;
+  
+  if (time(0) > priv->expired_by) {
+    status = EXPIRED;
+    update_gui(priv, status);
+    priv->magic_token_polling = FALSE;
+  }
+  gboolean token_received = poll_token_attach(priv);
+  if (token_received) {
+    priv->magic_token_polling = FALSE;
+    status = SUCCESS;
+    update_gui(priv, status);
+  }
+  pthread_exit(NULL);
+}
+
+static gboolean
+magic_parser(gchar *ptr,              /* pointer to actual response */
+              RestJSONResponse *resp) /* relevant response fields */
+{
+    g_autoptr(JsonParser) parser = json_parser_new();
+    JsonNode *root;
+    g_autoptr(GError) error = NULL;
+
+    json_parser_load_from_data(parser, ptr, -1, &error);
+    if (error) {
+        g_warning("Couldn't parse magic token JSON; %s\n", error->message);
+        g_print("%s\n", ptr);
+        return FALSE;
+    }
+    root = json_parser_get_root(parser);
+    if (!JSON_NODE_HOLDS_OBJECT(root)) {
+        g_warning("Invalid magic token JSON\n");
+        return FALSE;
+    }
+
+    JsonObject  *data, *attributes;
+    JsonObject *response = json_node_get_object(root);
+    data = json_object_get_object_member(response, "data");
+    attributes = json_object_get_object_member(data, "attributes");
+
+    resp->expiresIn = json_object_has_member(attributes, "expires_in") ?
+        json_object_get_int_member(attributes, "expires_in") :
+        0;
+    resp->token = json_object_has_member(attributes, "token") ?
+        g_strdup(json_object_get_string_member(attributes, "token")) :
+        NULL;
+    resp->code = json_object_has_member(attributes, "user_code") ?
+        g_strdup(json_object_get_string_member(attributes, "user_code")) :
+        NULL;
+    resp->contract_token = json_object_has_member(attributes, "contract_token") ?
+        g_strdup(json_object_get_string_member(attributes, "contract_token")) :
+        NULL;
+
+    return TRUE;
+}
+
+static void
+display_ua_services(GisUbuntuProServicesPagePrivate *priv)
+{
+    g_autoptr(JsonParser) parser = json_parser_new();
+    JsonNode    *root_node;
+    JsonObject  *root, *services, *contract;
+    JsonArray   *services_array;
+    g_autoptr(GError) error = NULL;
+    guint       i, n_services;
+    const char  *status, *description, *available, *contract_name;
+    gsize       len;
+    g_autofree gchar *str, *enabled_str, *available_str;
+
+    if (!parse_ua_status(&str, &len)) {
+        return;
+    }
+    available_str = (gchar *)g_malloc0(len);
+    enabled_str = (gchar *)g_malloc0(len);
+
+    json_parser_load_from_data(parser, str, strlen(str), &error);
+    if (error) {
+        g_warning("Couldn't parse magic token JSON; %s\n", error->message);
+    }
+    root_node = json_parser_get_root(parser);
+    if (!JSON_NODE_HOLDS_OBJECT(root_node)) {
+        g_warning("Invalid magic token JSON\n");
+    }
+
+    root = json_node_get_object(root_node);
+
+    contract = json_object_get_object_member(root, "contract");
+    contract_name = json_object_get_string_member(contract, "name");
+    gtk_label_set_text(GTK_LABEL(priv->contract_name), contract_name);
+
+    services_array = json_object_get_array_member(root, "services");
+    n_services = json_array_get_length(services_array);
+
+    /* Get services description, status and availability */
+    for (i = 0; i < n_services; i++) {
+        services = json_array_get_object_element(services_array, i);
+        if (
+            json_object_has_member(services, "description") &&
+            json_object_has_member(services, "status") &&
+            json_object_has_member(services, "available")
+        ) {
+            description = json_object_get_string_member(services, "description");
+            status = json_object_get_string_member(services, "status");
+            available = json_object_get_string_member(services, "available");
+            if (strcmp(status, "enabled") == 0) {
+              itemize(enabled_str, description, len);
+            } else if (strcmp(available, "yes") == 0) {
+              itemize(available_str, description, len);
+            }
+        }
+    }
+
+    /* Display enabled and disabled but available services */
+    if (enabled_str == NULL) {
+      gtk_widget_destroy(GTK_WIDGET(priv->enabled_services_header));
+    } else {
+      gtk_label_set_text(GTK_LABEL(priv->enabled_services), enabled_str);
+    }
+    if (available_str == NULL) {
+      gtk_widget_destroy(GTK_WIDGET(priv->available_services_header));
+    } else {
+      gtk_label_set_text(GTK_LABEL(priv->available_services), available_str);
+    }
+}
+
+static void
+request_magic_attach (GisUbuntuProAttachPage *page)
+{
+  GisUbuntuProAttachPagePrivate *priv = gis_ubuntupro_attach_page_get_instance_private (page);
+  gchar *std_out, *std_err;
+  g_autoptr(GError) error = NULL;
+  int rc;
+
+  if (priv->magic_token_polling) {
+    return;
+  }
+
+  if (!g_spawn_command_line_sync("/bin/ua api u.pro.attach.magic.initiate.v1",
+                                 &std_out, &std_err, NULL, &error)) {
+    g_warning ("Failed to request magic token: %s", error->message);
+    return;
+  }
+
+  RestJSONResponse resp;
+  if (!magic_parser(std_out, &resp)) {
+    g_print("%s\n",std_out);
+    g_warning("Couldn't parse response.\n");
+    return;
+  }
+  gtk_label_set_text (GTK_LABEL (priv->pin_label), resp.code);
+  priv->expired_by = resp.expiresIn + time(0);
+  priv->token = g_strdup(resp.token);
+  priv->magic_token_polling = TRUE;
+  rc = pthread_create(&priv->poll_id, NULL, poll_magic_token, (void *)page);
+  if (rc) {
+    g_warning ("Couldn't create PIN polling thread");
+    return;
+  }
+  update_gui(priv, 0);
+  g_free(resp.token);
+  g_free(resp.code);
+}
+
+static void
+on_ua_attach_requested (GObject *source,
+                        GAsyncResult *result,
+                        gpointer user_data)
+{
+  GisUbuntuProAttachPagePrivate *priv = user_data;
+  g_autoptr(GError) error = NULL;
+  g_autoptr(GVariant) retval = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
+  status_t status;
+
+  if (retval == NULL) {
+    g_warning ("Failed to attach token: %s", error->message);
+    status = FAIL;
+  } else {
+    SuccessfullyAttached = TRUE;
+    status = SUCCESS;
+    pthread_cancel(priv->poll_id);
+    gis_page_set_complete (GIS_PAGE(priv->main_page), TRUE);
+    g_free(priv->contract_token);
+    g_free(priv->token);
+  }
+  priv->attaching = FALSE;
+  update_gui(priv, status);
+}
+
+static void
+ua_attach(const gchar *token, GisUbuntuProAttachPagePrivate *priv)
+{
+  GDBusConnection *bus;
+  g_autoptr(GError) error = NULL;
+  status_t        status = NONE;
+
+  if (priv->attaching) {
+    return;
+  }
+
+  bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
+  if (bus == NULL) {
+      g_warning("Failed to get system bus: %s", error->message);
+  } else {
+    priv->attaching = TRUE;
+    update_gui(priv, status);
+
+    g_dbus_connection_call(bus,
+      "com.canonical.UbuntuAdvantage",
+      "/com/canonical/UbuntuAdvantage/Manager",
+      "com.canonical.UbuntuAdvantage.Manager",
+      "Attach",
+      g_variant_new("(s)", token),
+      G_VARIANT_TYPE("()"),
+      G_DBUS_CALL_FLAGS_NONE,
+      543210, /* I have observed that -1, the default timeout, is not enough. */
+      NULL,
+      on_ua_attach_requested,
+      priv);
+  }
+}
+
+void
+on_token_typing (GtkButton *button, GisUbuntuProAttachPage *page)
+{
+  GisUbuntuProAttachPagePrivate *priv = gis_ubuntupro_attach_page_get_instance_private (page);
+
+  gis_page_set_complete (
+      GIS_PAGE(priv->main_page),
+      gtk_entry_get_text_length(GTK_ENTRY(priv->token_field)) > 0
+  );
+}
+
+void
+request_token_attach (GtkButton *button, GisUbuntuProAttachPage *page)
+{
+  GisUbuntuProAttachPagePrivate *priv = gis_ubuntupro_attach_page_get_instance_private (page);
+
+  const gchar *token = gtk_entry_get_text(GTK_ENTRY(priv->token_field));
+  ua_attach(token, priv);
+  gtk_entry_set_text(GTK_ENTRY(priv->token_field), "");
+}
+
+void
+on_magic_clicked (GtkButton *button, GisUbuntuProAttachPage *page)
+{
+  GisUbuntuProAttachPagePrivate *priv = gis_ubuntupro_attach_page_get_instance_private (page);
+  priv->active_radio = MAGIC;
+
+  request_magic_attach(page);
+}
+
+void
+on_radio_toggled (GtkButton *button, GisUbuntuProAttachPage *page)
+{
+  GisUbuntuProAttachPagePrivate *priv = gis_ubuntupro_attach_page_get_instance_private (page);
+  status_t status = NONE;
+
+  priv->active_radio = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->token_radio)) ? TOKEN : MAGIC;
+  update_gui(priv, status);
+}
+
+/* Callback for the Previous button */
+static gboolean
+gis_ubuntupro_page_go_back (GisPage *gis_page)
+{
+  GisUbuntuProPage *page = GIS_UBUNTUPRO_PAGE (gis_page);
+  GisUbuntuProPagePrivate *priv = gis_ubuntupro_page_get_instance_private (page);
+  GisUbuntuProOfferPage *offer_page = GIS_UBUNTUPRO_OFFER_PAGE (priv->offer_page);
+  GisUbuntuProAttachPage *attach_page = GIS_UBUNTUPRO_ATTACH_PAGE (priv->attach_page);
+
+  switch (priv->current_page) {
+  case OFFER_PAGE:
+    return FALSE;
+  case ATTACH_PAGE:
+    gis_page_set_complete (gis_page, TRUE);
+    gtk_stack_set_visible_child (GTK_STACK (priv->stack), GTK_WIDGET(offer_page));
+    priv->current_page = OFFER_PAGE;
+    break;
+  case SERVICES_PAGE:
+    gtk_stack_set_visible_child (GTK_STACK (priv->stack), GTK_WIDGET(attach_page));
+    priv->current_page = ATTACH_PAGE;
+    break;
+  }
+  return TRUE;
+}
+
+/* Callback for the Next button */
+static gboolean
+gis_ubuntupro_page_apply (GisPage      *gis_page,
+                          GCancellable *cancellable)
+{
+  GisUbuntuProPage *page = GIS_UBUNTUPRO_PAGE (gis_page);
+  GisUbuntuProPagePrivate *priv = gis_ubuntupro_page_get_instance_private (page);
+  GisUbuntuProOfferPage *offer_page = GIS_UBUNTUPRO_OFFER_PAGE (priv->offer_page);
+  GisUbuntuProOfferPagePrivate *offer_priv = gis_ubuntupro_offer_page_get_instance_private (offer_page);
+  GisUbuntuProAttachPage *attach_page = GIS_UBUNTUPRO_ATTACH_PAGE (priv->attach_page);
+  GisUbuntuProAttachPagePrivate *attach_priv = gis_ubuntupro_attach_page_get_instance_private (attach_page);
+  switch (priv->current_page) {
+  case OFFER_PAGE:
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (offer_priv->skip_pro_select))) {
+      return FALSE;
+    }
+    /* Request magic token already if didn't yet and advance to next local page */
+    if (!SuccessfullyAttached && !attach_priv->attaching) {
+      request_magic_attach(attach_page);
+    }
+    gis_page_apply_complete (GIS_PAGE (page), FALSE);
+    update_gui(attach_priv, 0);
+    gtk_stack_set_visible_child (GTK_STACK (priv->stack), GTK_WIDGET(attach_page));
+    priv->current_page = ATTACH_PAGE;
+    break;
+  case ATTACH_PAGE:
+    if (SuccessfullyAttached) {
+      GisUbuntuProServicesPage *services_page = GIS_UBUNTUPRO_SERVICES_PAGE(priv->services_page);
+      display_ua_services(gis_ubuntupro_services_page_get_instance_private (services_page));
+      gtk_stack_set_visible_child (GTK_STACK (priv->stack), priv->services_page);
+      gis_page_apply_complete (GIS_PAGE (page), FALSE);
+    } else {
+      if (attach_priv->active_radio == MAGIC) {
+        ua_attach(attach_priv->contract_token, attach_priv);
+      } else {
+        request_token_attach(NULL, attach_page);
+      }
+      gis_page_apply_complete (GIS_PAGE (page), FALSE);
+      return FALSE;
+    }
+    priv->current_page = SERVICES_PAGE;
+    break;
+  case SERVICES_PAGE:
+    return FALSE;
+  }
+  return TRUE;
+}
+
+static void
+gis_ubuntupro_page_class_init (GisUbuntuProPageClass *klass)
+{
+  GisPageClass *page_class = GIS_PAGE_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/initial-setup/gis-ubuntupro-page.ui");
+
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProPage, offer_page);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProPage, attach_page);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProPage, services_page);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProPage, stack);
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), request_token_attach);
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), request_magic_attach);
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), on_radio_toggled);
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), on_magic_clicked);
+
+  page_class->page_id = PAGE_ID;
+  page_class->locale_changed = gis_ubuntupro_page_locale_changed;
+  page_class->apply = gis_ubuntupro_page_apply;
+  page_class->go_back = gis_ubuntupro_page_go_back;
+  object_class->constructed = gis_ubuntupro_page_constructed;
+  object_class->dispose = gis_ubuntupro_page_dispose;
+}
+static void
+gis_ubuntupro_offer_page_class_init (GisUbuntuProOfferPageClass *klass)
+{
+  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/initial-setup/gis-ubuntupro-offer-page.ui");
+
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProOfferPage, ubuntu_pro_logo);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProOfferPage, enable_pro_select);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProOfferPage, skip_pro_select);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProOfferPage, offline_warning);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProOfferPage, pro_status_image);
+}
+
+static void
+gis_ubuntupro_attach_page_class_init (GisUbuntuProAttachPageClass *klass)
+{
+  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/initial-setup/gis-ubuntupro-attach-page.ui");
+
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProAttachPage, ubuntu_pro_logo);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProAttachPage, pin_label);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProAttachPage, token_field);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProAttachPage, token_status);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProAttachPage, token_spinner);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProAttachPage, token_status_icon);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProAttachPage, pin_status);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProAttachPage, pin_spinner);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProAttachPage, pin_status_icon);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProAttachPage, pin_hint);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProAttachPage, token_radio);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProAttachPage, magic_radio);
+}
+static void
+gis_ubuntupro_services_page_class_init (GisUbuntuProServicesPageClass *klass)
+{
+  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/initial-setup/gis-ubuntupro-services-page.ui");
+
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProServicesPage, enabled_services);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProServicesPage, enabled_services_header);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProServicesPage, available_services);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProServicesPage, available_services_header);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProServicesPage, contract_name);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuProServicesPage, checkmark);
+}
+
+static void
+gis_ubuntupro_page_init (GisUbuntuProPage *page)
+{
+  g_resources_register (ubuntupro_get_resource ());
+
+  /* Magic that makes stuff compile */
+  gis_ubuntupro_offer_page_get_type ();
+  gis_ubuntupro_attach_page_get_type ();
+  gis_ubuntupro_services_page_get_type ();
+
+  gtk_widget_init_template (GTK_WIDGET (page));
+}
+static void
+gis_ubuntupro_offer_page_init (GisUbuntuProOfferPage *page)
+{
+  g_resources_register (ubuntupro_get_resource ());
+
+  gtk_widget_init_template (GTK_WIDGET (page));
+}
+static void
+gis_ubuntupro_attach_page_init (GisUbuntuProAttachPage *page)
+{
+  g_resources_register (ubuntupro_get_resource ());
+
+  gtk_widget_init_template (GTK_WIDGET (page));
+}
+static void
+gis_ubuntupro_services_page_init (GisUbuntuProServicesPage *page)
+{
+  g_resources_register (ubuntupro_get_resource ());
+
+  gtk_widget_init_template (GTK_WIDGET (page));
+}
+
+GisPage *
+gis_prepare_ubuntu_pro_page (GisDriver *driver)
+{
+  gboolean attached;
+  if (!get_ubuntu_advantage_attached (&attached)) {
+      g_warning("Couldn't fetch the Ubuntu Pro status.\n");
+      return NULL;
+  }
+  if (attached) {
+      g_warning("Ubuntu Pro is already attached. Skipping Ubuntu Pro pages.\n");
+      return NULL;
+  }
+
+  if (!is_ubuntupro_supported ())
+    return NULL;
+
+  return g_object_new (GIS_TYPE_UBUNTUPRO_PAGE,
+                       "driver", driver,
+                       NULL);
+}
diff --git a/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-page.h b/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-page.h
new file mode 100644
index 0000000..50676c2
--- /dev/null
+++ b/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-page.h
@@ -0,0 +1,110 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 2018 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIS_UBUNTUPRO_PAGE_H__
+#define __GIS_UBUNTUPRO_PAGE_H__
+
+#include "gnome-initial-setup.h"
+
+G_BEGIN_DECLS
+
+#define GIS_TYPE_UBUNTUPRO_PAGE            (gis_ubuntupro_page_get_type ())
+#define GIS_TYPE_UBUNTUPRO_OFFER_PAGE           (gis_ubuntupro_offer_page_get_type ())
+#define GIS_TYPE_UBUNTUPRO_ATTACH_PAGE           (gis_ubuntupro_attach_page_get_type ())
+#define GIS_TYPE_UBUNTUPRO_SERVICES_PAGE           (gis_ubuntupro_services_page_get_type ())
+
+#define GIS_UBUNTUPRO_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIS_TYPE_UBUNTUPRO_PAGE, GisUbuntuProPage))
+#define GIS_UBUNTUPRO_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIS_TYPE_UBUNTUPRO_PAGE, GisUbuntuProPageClass))
+#define GIS_UBUNTUPRO_OFFER_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIS_TYPE_UBUNTUPRO_OFFER_PAGE, GisUbuntuProOfferPage))
+#define GIS_UBUNTUPRO_OFFER_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIS_TYPE_UBUNTUPRO_OFFER_PAGE, GisUbuntuProOfferPageClass))
+#define GIS_UBUNTUPRO_ATTACH_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIS_TYPE_UBUNTUPRO_ATTACH_PAGE, GisUbuntuProAttachPage))
+#define GIS_UBUNTUPRO_ATTACH_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIS_TYPE_UBUNTUPRO_ATTACH_PAGE, GisUbuntuProAttachPageClass))
+#define GIS_UBUNTUPRO_SERVICES_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIS_TYPE_UBUNTUPRO_SERVICES_PAGE, GisUbuntuProServicesPage))
+#define GIS_UBUNTUPRO_SERVICES_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIS_TYPE_UBUNTUPRO_SERVICES_PAGE, GisUbuntuProServicesPageClass))
+
+#define GIS_IS_UBUNTUPRO_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIS_TYPE_UBUNTUPRO_PAGE))
+#define GIS_IS_UBUNTUPRO_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIS_TYPE_UBUNTUPRO_PAGE))
+#define GIS_IS_UBUNTUPRO_OFFER_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIS_TYPE_UBUNTUPRO_OFFER_PAGE))
+#define GIS_IS_UBUNTUPRO_OFFER_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIS_TYPE_UBUNTUPRO_OFFER_PAGE))
+#define GIS_IS_UBUNTUPRO_ATTACH_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIS_TYPE_UBUNTUPRO_ATTACH_PAGE))
+#define GIS_IS_UBUNTUPRO_ATTACH_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIS_TYPE_UBUNTUPRO_ATTACH_PAGE))
+#define GIS_IS_UBUNTUPRO_SERVICES_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIS_TYPE_UBUNTUPRO_SERVICES_PAGE))
+#define GIS_IS_UBUNTUPRO_SERVICES_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIS_TYPE_UBUNTUPRO_SERVICES_PAGE))
+
+#define GIS_UBUNTUPRO_PAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIS_TYPE_UBUNTUPRO_PAGE, GisUbuntuProPageClass))
+#define GIS_UBUNTUPRO_OFFER_PAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIS_TYPE_UBUNTUPRO_OFFER_PAGE, GisUbuntuProOfferPageClass))
+#define GIS_UBUNTUPRO_ATTACH_PAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIS_TYPE_UBUNTUPRO_ATTACH_PAGE, GisUbuntuProAttachPageClass))
+#define GIS_UBUNTUPRO_SERVICES_PAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIS_TYPE_UBUNTUPRO_SERVICES_PAGE, GisUbuntuProServicesPageClass))
+
+typedef struct _GisUbuntuProPage        GisUbuntuProPage;
+typedef struct _GisUbuntuProPageClass   GisUbuntuProPageClass;
+typedef struct _GisUbuntuProOfferPage       GisUbuntuProOfferPage;
+typedef struct _GisUbuntuProOfferPageClass  GisUbuntuProOfferPageClass;
+typedef struct _GisUbuntuProAttachPage       GisUbuntuProAttachPage;
+typedef struct _GisUbuntuProAttachPageClass  GisUbuntuProAttachPageClass;
+typedef struct _GisUbuntuProServicesPage       GisUbuntuProServicesPage;
+typedef struct _GisUbuntuProServicesPageClass  GisUbuntuProServicesPageClass;
+
+struct _GisUbuntuProPage
+{
+  GisPage parent;
+};
+struct _GisUbuntuProPageClass
+{
+  GisPageClass parent_class;
+};
+
+struct _GisUbuntuProOfferPage
+{
+  GtkBin parent;
+};
+struct _GisUbuntuProOfferPageClass
+{
+  GtkBinClass parent_class;
+};
+
+struct _GisUbuntuProAttachPage
+{
+  GtkBin parent;
+};
+struct _GisUbuntuProAttachPageClass
+{
+  GtkBinClass parent_class;
+};
+
+struct _GisUbuntuProServicesPage
+{
+  GtkBin parent;
+};
+
+struct _GisUbuntuProServicesPageClass
+{
+  GtkBinClass parent_class;
+};
+
+GType gis_ubuntupro_page_get_type (void);
+GType gis_ubuntupro_offer_page_get_type (void);
+GType gis_ubuntupro_attach_page_get_type (void);
+GType gis_ubuntupro_services_page_get_type (void);
+
+GisPage *gis_prepare_ubuntu_pro_page (GisDriver *driver);
+
+
+G_END_DECLS
+
+#endif /* __GIS_UBUNTUPRO_PAGE_H__ */
diff --git a/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-page.ui b/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-page.ui
new file mode 100644
index 0000000..883c92c
--- /dev/null
+++ b/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-page.ui
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <template class="GisUbuntuProPage" parent="GisPage">
+    <child>
+  <object class="GtkBox" id="stepUbuntuPro">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+        <child>
+          <object class="GtkStack" id="stack">
+            <property name="visible">True</property>
+            <property name="valign">start</property>
+            <property name="vexpand">True</property>
+            <child>
+              <object class="GisUbuntuProOfferPage" id="offer_page">
+                <property name="visible">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GisUbuntuProAttachPage" id="attach_page">
+                <property name="visible">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GisUbuntuProServicesPage" id="services_page">
+                <property name="visible">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-services-page.ui b/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-services-page.ui
new file mode 100644
index 0000000..8fcbe2a
--- /dev/null
+++ b/gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-services-page.ui
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <template class="GisUbuntuProServicesPage" parent="GtkBin">
+  <child>
+  <object class="GtkBox" id="services_page">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="no-show-all">True</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkLabel">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="halign">start</property>
+        <property name="margin-top">3</property>
+        <property name="margin-bottom">0</property>
+        <property name="label" translatable="yes">&lt;b&gt;Ubuntu Pro Services&lt;/b&gt;</property>
+        <property name="use-markup">True</property>
+        <property name="wrap">True</property>
+        <property name="xalign">0</property>
+        <attributes>
+          <attribute name="scale" value="1.4"/>
+        </attributes>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparator">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="margin-top">10</property>
+        <property name="margin-bottom">10</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="no-show-all">True</property>
+        <child>
+          <object class="GtkImage" id="checkmark">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="margin-left">10</property>
+            <property name="margin-right">20</property>
+            <property name="yalign">0</property>
+          </object>
+        </child>
+        <child>
+        <object class="GtkBox">
+          <property name="visible">True</property>
+          <property name="can-focus">False</property>
+          <property name="no-show-all">True</property>
+          <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="label" translatable="yes">Your subscription:</property>
+            <property name="margin-bottom">10</property>
+            <property name="visible">True</property>
+            <property name="halign">start</property>
+            <attributes>
+              <attribute name="scale" value="1.5"/>
+            </attributes>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="contract_name">
+            <property name="visible">True</property>
+            <property name="margin-bottom">15</property>
+            <property name="halign">start</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="enabled_services_header">
+            <property name="label" translatable="yes">List of your enabled services:</property>
+            <property name="margin-bottom">10</property>
+            <property name="visible">True</property>
+            <property name="halign">start</property>
+            <attributes>
+              <attribute name="scale" value="1.5"/>
+            </attributes>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="enabled_services">
+            <property name="margin-left">3</property>
+            <property name="visible">True</property>
+            <property name="halign">start</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="available_services_header">
+            <property name="label" translatable="yes">Other available services:</property>
+            <property name="margin-bottom">10</property>
+            <property name="visible">True</property>
+            <property name="halign">start</property>
+            <attributes>
+              <attribute name="scale" value="1.5"/>
+            </attributes>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="available_services">
+            <property name="margin-left">3</property>
+            <property name="visible">True</property>
+            <property name="halign">start</property>
+          </object>
+        </child>
+        </object>
+        </child>
+        </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="label" translatable="yes">You can start using Ubuntu Pro features once Ubuntu has finished installing. If you want to change the default enablements for your token you can do so via the ubuntu.com/pro web interface. Alternatively you can change enabled services by going to the Settings menu or the `ua` command-line.</property>
+            <property name="visible">True</property>
+            <property name="wrap">True</property>
+            <property name="halign">start</property>
+          </object>
+        </child>
+  </object>
+  </child>
+  </template>
+</interface>
diff --git a/gnome-initial-setup/pages/ubuntu-pro/meson.build b/gnome-initial-setup/pages/ubuntu-pro/meson.build
new file mode 100644
index 0000000..f7b700a
--- /dev/null
+++ b/gnome-initial-setup/pages/ubuntu-pro/meson.build
@@ -0,0 +1,12 @@
+sources += gnome.compile_resources(
+    'ubuntupro-resources',
+    files('ubuntupro.gresource.xml'),
+    c_name: 'ubuntupro'
+)
+
+sources += files(
+    'gis-ubuntupro-page.c',
+    'gis-ubuntupro-page.h',
+    'utils.c',
+    'utils.h',
+)
diff --git a/gnome-initial-setup/pages/ubuntu-pro/ubuntu-pro-dark.svg b/gnome-initial-setup/pages/ubuntu-pro/ubuntu-pro-dark.svg
new file mode 100644
index 0000000..e33bf48
--- /dev/null
+++ b/gnome-initial-setup/pages/ubuntu-pro/ubuntu-pro-dark.svg
@@ -0,0 +1,25 @@
+<svg width="132" height="34" viewBox="0 0 132 34" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_7165)">
+<path d="M32.24 29.4699C30.94 29.4699 29.91 29.2199 29.14 28.7099C28.37 28.1999 27.81 27.5199 27.47 26.6599C27.13 25.7999 26.96 24.8499 26.96 23.7899V14.6799H28.38V23.5999C28.38 25.1899 28.74 26.3499 29.45 27.0899C30.16 27.8299 31.09 28.1999 32.25 28.1999C33.41 28.1999 34.34 27.8299 35.05 27.0899C35.76 26.3499 36.12 25.1899 36.12 23.5999V14.6799H37.54V23.7899C37.54 24.8499 37.37 25.8099 37.03 26.6599C36.69 27.5099 36.13 28.1999 35.36 28.7099C34.59 29.2199 33.55 29.4699 32.26 29.4699H32.24Z" fill="white"/>
+<path d="M44.96 29.41C44.33 29.41 43.77 29.3799 43.28 29.32C42.79 29.26 42.35 29.18 41.99 29.09C41.62 29 41.3 28.91 41.04 28.83V13.2L42.4 12.95V19.01C42.64 18.83 43.02 18.64 43.55 18.44C44.08 18.24 44.69 18.14 45.39 18.14C46.43 18.14 47.32 18.38 48.04 18.86C48.76 19.34 49.32 20.01 49.7 20.86C50.08 21.71 50.27 22.68 50.27 23.78C50.27 24.95 50.05 25.96 49.6 26.8C49.15 27.64 48.54 28.29 47.74 28.74C46.95 29.19 46.02 29.42 44.96 29.42V29.41ZM44.94 28.18C45.72 28.18 46.4 28.01 46.98 27.67C47.56 27.33 48.01 26.83 48.34 26.17C48.67 25.51 48.83 24.71 48.83 23.78C48.83 23.18 48.77 22.62 48.64 22.09C48.51 21.56 48.31 21.09 48.03 20.68C47.75 20.27 47.39 19.95 46.93 19.72C46.47 19.49 45.92 19.38 45.25 19.38C44.58 19.38 44.03 19.49 43.52 19.71C43 19.93 42.63 20.14 42.39 20.34V27.9C42.6 27.96 42.91 28.02 43.33 28.09C43.75 28.16 44.28 28.19 44.94 28.19V28.18Z" fill="white"/>
+<path d="M57.2402 29.3699C56.1702 29.3699 55.3202 29.1599 54.6902 28.7499C54.0602 28.3399 53.6202 27.7599 53.3502 27.0199C53.0902 26.2699 52.9502 25.4099 52.9502 24.4199V18.3599H54.3102V23.9799C54.3102 24.9999 54.4102 25.8099 54.6102 26.4099C54.8102 27.0199 55.1402 27.4499 55.6002 27.7299C56.0602 27.9999 56.6702 28.1399 57.4402 28.1399C58.0802 28.1399 58.6402 28.0999 59.1102 28.0399C59.5802 27.9799 59.8802 27.9099 60.0102 27.8499V18.3699H61.3702V28.7899C60.9702 28.8999 60.4202 29.0299 59.7402 29.1699C59.0602 29.3099 58.2202 29.3799 57.2302 29.3799L57.2402 29.3699Z" fill="white"/>
+<path d="M64.7598 29.1599V18.7399C65.1598 18.6299 65.7098 18.4999 66.3998 18.3599C67.0898 18.2199 67.9198 18.1499 68.8998 18.1499C69.9998 18.1499 70.8598 18.3599 71.4798 18.7799C72.0998 19.1999 72.5398 19.7799 72.7998 20.5199C73.0598 21.2699 73.1898 22.1299 73.1898 23.1199V29.1599H71.8298V23.5599C71.8298 22.5399 71.7398 21.7299 71.5498 21.1199C71.3598 20.5099 71.0398 20.0699 70.5798 19.7899C70.1198 19.5199 69.4898 19.3799 68.6998 19.3799C68.0598 19.3799 67.5098 19.4199 67.0398 19.4799C66.5698 19.5499 66.2698 19.6099 66.1298 19.6699V29.1499H64.7698L64.7598 29.1599Z" fill="white"/>
+<path d="M79.8899 29.3899C78.9999 29.3899 78.2999 29.2299 77.7799 28.9199C77.2599 28.6099 76.8999 28.1399 76.6899 27.5099C76.4799 26.8799 76.3799 26.0899 76.3799 25.1299V15.1899L77.7399 14.9399V18.3699H82.0399V19.5199H77.7399V25.2599C77.7399 26.0799 77.8299 26.6999 78.0099 27.1199C78.1899 27.5399 78.4499 27.8199 78.7899 27.9499C79.1299 28.0899 79.5199 28.1599 79.9699 28.1599C80.5399 28.1599 80.9999 28.0899 81.3499 27.9499C81.6999 27.8099 81.9699 27.6899 82.1599 27.5999L82.4899 28.7299C82.2899 28.8499 81.9499 28.9999 81.4699 29.1599C80.9799 29.3199 80.4499 29.3999 79.8799 29.3999L79.8899 29.3899Z" fill="white"/>
+<path d="M88.5898 29.3699C87.5198 29.3699 86.6698 29.1599 86.0398 28.7499C85.4098 28.3399 84.9698 27.7599 84.6998 27.0199C84.4398 26.2699 84.2998 25.4099 84.2998 24.4199V18.3599H85.6598V23.9799C85.6598 24.9999 85.7598 25.8099 85.9598 26.4099C86.1598 27.0199 86.4898 27.4499 86.9498 27.7299C87.4098 27.9999 88.0198 28.1399 88.7898 28.1399C89.4298 28.1399 89.9898 28.0999 90.4598 28.0399C90.9298 27.9799 91.2298 27.9099 91.3598 27.8499V18.3699H92.7198V28.7899C92.3198 28.8999 91.7698 29.0299 91.0898 29.1699C90.4098 29.3099 89.5698 29.3799 88.5798 29.3799L88.5898 29.3699Z" fill="white"/>
+<path d="M101.17 29.1601V14.9601C101.67 14.8201 102.26 14.7201 102.94 14.6601C103.61 14.6001 104.24 14.5701 104.83 14.5701C106.86 14.5701 108.38 14.9601 109.39 15.7501C110.4 16.5401 110.9 17.6401 110.9 19.0601C110.9 20.1601 110.65 21.0401 110.14 21.7001C109.63 22.3601 108.9 22.8401 107.96 23.1301C107.01 23.4201 105.88 23.5701 104.55 23.5701H102.59V29.1701H101.17V29.1601ZM102.59 22.3301H104.39C105.41 22.3301 106.29 22.2401 107.04 22.0701C107.79 21.9001 108.38 21.5701 108.79 21.0901C109.21 20.6101 109.42 19.9201 109.42 19.0301C109.42 18.1401 109.2 17.5201 108.76 17.0601C108.32 16.5901 107.76 16.2701 107.07 16.0801C106.38 15.8901 105.65 15.8001 104.89 15.8001C104.37 15.8001 103.93 15.8201 103.55 15.8501C103.17 15.8801 102.85 15.9201 102.59 15.9401V22.3301Z" fill="white"/>
+<path d="M113.34 29.1599V18.8599C113.69 18.7099 114.17 18.5499 114.78 18.3899C115.39 18.2299 116.14 18.1499 117.02 18.1499C117.31 18.1499 117.6 18.1699 117.89 18.1999C118.18 18.2399 118.43 18.2799 118.64 18.3199C118.85 18.3599 119.01 18.4099 119.11 18.4599L118.84 19.6299C118.74 19.5699 118.52 19.5099 118.17 19.4499C117.82 19.3899 117.37 19.3599 116.81 19.3599C116.23 19.3599 115.76 19.3999 115.4 19.4799C115.05 19.5599 114.81 19.6299 114.7 19.6899V29.1499H113.34V29.1599Z" fill="white"/>
+<path d="M125.12 29.4099C124.16 29.4099 123.31 29.1799 122.57 28.7099C121.83 28.2399 121.25 27.5899 120.83 26.7399C120.41 25.8899 120.19 24.8999 120.19 23.7699C120.19 22.6399 120.4 21.6399 120.83 20.7899C121.25 19.9499 121.84 19.2899 122.57 18.8199C123.3 18.3499 124.16 18.1099 125.12 18.1099C126.08 18.1099 126.93 18.3499 127.68 18.8199C128.42 19.2899 129.01 19.9499 129.42 20.7899C129.84 21.6299 130.05 22.6199 130.05 23.7699C130.05 24.9199 129.84 25.8899 129.42 26.7399C129 27.5899 128.42 28.2499 127.68 28.7099C126.93 29.1799 126.08 29.4099 125.12 29.4099ZM125.12 28.1799C125.83 28.1799 126.45 27.9999 126.97 27.6399C127.49 27.2799 127.9 26.7699 128.18 26.0999C128.47 25.4399 128.61 24.6599 128.61 23.7699C128.61 22.8799 128.47 22.0799 128.18 21.4199C127.89 20.7599 127.49 20.2499 126.97 19.8799C126.45 19.5199 125.83 19.3399 125.12 19.3399C124.41 19.3399 123.79 19.5199 123.27 19.8799C122.75 20.2399 122.34 20.7499 122.06 21.4199C121.77 22.0799 121.63 22.8699 121.63 23.7699C121.63 24.6699 121.77 25.4399 122.06 26.0999C122.35 26.7599 122.75 27.2699 123.27 27.6399C123.79 27.9999 124.41 28.1799 125.12 28.1799Z" fill="white"/>
+<path d="M21.5 0H0.5V32H21.5V0Z" fill="#E95420"/>
+<path d="M5.29988 23.32C6.49834 23.32 7.46988 22.3484 7.46988 21.15C7.46988 19.9515 6.49834 18.98 5.29988 18.98C4.10142 18.98 3.12988 19.9515 3.12988 21.15C3.12988 22.3484 4.10142 23.32 5.29988 23.32Z" fill="white"/>
+<path d="M14.3599 18.56C15.5584 18.56 16.5299 17.5884 16.5299 16.39C16.5299 15.1915 15.5584 14.22 14.3599 14.22C13.1615 14.22 12.1899 15.1915 12.1899 16.39C12.1899 17.5884 13.1615 18.56 14.3599 18.56Z" fill="white"/>
+<path d="M10.2 26.75C8.62998 26.41 7.32998 25.41 6.58998 24C6.00998 24.26 5.35998 24.34 4.72998 24.23C5.61998 26.42 7.50998 28 9.82998 28.5C10.34 28.61 10.86 28.66 11.37 28.66C10.97 28.14 10.75 27.5 10.73 26.84C10.55 26.82 10.37 26.79 10.2 26.75Z" fill="white"/>
+<path d="M13.8702 28.9301C15.0687 28.9301 16.0402 27.9585 16.0402 26.7601C16.0402 25.5616 15.0687 24.5901 13.8702 24.5901C12.6717 24.5901 11.7002 25.5616 11.7002 26.7601C11.7002 27.9585 12.6717 28.9301 13.8702 28.9301Z" fill="white"/>
+<path d="M16.8898 25.9601C17.5698 25.1101 18.0398 24.1001 18.2698 23.0301C18.6698 21.1601 18.2998 19.2001 17.2398 17.6101C16.9898 18.2001 16.5598 18.7001 16.0198 19.0401C16.6098 20.1501 16.7898 21.4201 16.5198 22.6501C16.3898 23.2501 16.1598 23.8201 15.8398 24.3301C16.3498 24.7501 16.7098 25.3101 16.8798 25.9501L16.8898 25.9601Z" fill="white"/>
+<path d="M5.12988 18.04C5.18988 18.04 5.23988 18.04 5.29988 18.04C5.51988 18.04 5.73988 18.06 5.95988 18.11C6.30988 18.19 6.64988 18.32 6.94988 18.51C7.92988 17.1 9.50988 16.26 11.2199 16.23C11.2199 16.07 11.2499 15.9 11.2899 15.74C11.3899 15.27 11.5899 14.84 11.8799 14.47C9.14988 14.25 6.48988 15.66 5.13988 18.05L5.12988 18.04Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1_7165">
+<rect width="130.71" height="34" fill="white" transform="translate(0.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/gnome-initial-setup/pages/ubuntu-pro/ubuntu-pro.svg b/gnome-initial-setup/pages/ubuntu-pro/ubuntu-pro.svg
new file mode 100644
index 0000000..d377e41
--- /dev/null
+++ b/gnome-initial-setup/pages/ubuntu-pro/ubuntu-pro.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1444.23 360.27"><defs><style>.cls-1{fill:#e95420;}.cls-2{fill:#fff;}.cls-3{fill:#111;}</style></defs><rect class="cls-1" width="233.93" height="360.27"/><circle class="cls-2" cx="52.26" cy="238.51" r="24.44"/><circle class="cls-2" cx="154.06" cy="184.91" r="24.44"/><path class="cls-2" d="M107.39,301.42a59.52,59.52,0,0,1-40.6-31A35.22,35.22,0,0,1,45.89,273a80.08,80.08,0,0,0,74.65,49.8,35,35,0,0,1-7.16-20.44A60.26,60.26,0,0,1,107.39,301.42Z"/><circle class="cls-2" cx="148.55" cy="301.55" r="24.44"/><path class="cls-2" d="M182.56,292.58a79.94,79.94,0,0,0,4-93.83,35.16,35.16,0,0,1-13.74,16.09,60,60,0,0,1-2,59.53A35,35,0,0,1,182.56,292.58Z"/><path class="cls-2" d="M50.37,203.46c.62,0,1.24-.05,1.87-.05a35.36,35.36,0,0,1,7.37.78,35,35,0,0,1,11.16,4.5,59.63,59.63,0,0,1,48-25.68,36.52,36.52,0,0,1,.74-5.5,35.3,35.3,0,0,1,6.68-14.32A80.38,80.38,0,0,0,50.37,203.46Z"/><path class="cls-3" d="M347.78,331.73q-16.27,0-27.71-5a47.72,47.72,0,0,1-18.52-13.68,54.81,54.81,0,0,1-10.26-20.41,95.22,95.22,0,0,1-3.19-25.12V164.73h16V265.45a75.46,75.46,0,0,0,3.19,23.23,44.78,44.78,0,0,0,8.84,16.16,34.55,34.55,0,0,0,13.68,9.44,54.06,54.06,0,0,0,35.86,0,34.55,34.55,0,0,0,13.68-9.44,44.78,44.78,0,0,0,8.84-16.16,75.46,75.46,0,0,0,3.19-23.23V164.73h16V267.57a95.22,95.22,0,0,1-3.19,25.12A54.81,54.81,0,0,1,394,313.1a47.76,47.76,0,0,1-18.51,13.68Q364.06,331.73,347.78,331.73Z"/><path class="cls-3" d="M460.55,213.56q4-3.06,12.85-6.49a58,58,0,0,1,20.88-3.42,55.7,55.7,0,0,1,23.47,4.72,48.76,48.76,0,0,1,17.33,13.21,58.28,58.28,0,0,1,10.74,20.17,85.49,85.49,0,0,1,3.65,25.59A76.4,76.4,0,0,1,545.11,294,57.25,57.25,0,0,1,532.84,314,52.66,52.66,0,0,1,514,326.66,65.48,65.48,0,0,1,489.56,331q-16.28,0-26.89-2.12a137.63,137.63,0,0,1-17.45-4.48V148l15.33-2.83Zm0,100.25A68.84,68.84,0,0,0,471,316.05a127.35,127.35,0,0,0,18.28,1.06q19.81,0,31.85-12.86t12-36.91a84.07,84.07,0,0,0-2.13-19.23,44.87,44.87,0,0,0-6.84-15.8,34.25,34.25,0,0,0-12.38-10.73q-7.67-4-19-4a49.31,49.31,0,0,0-10.38,1.06,61.57,61.57,0,0,0-9.19,2.71,51,51,0,0,0-12.74,7.08Z"/><path class="cls-3" d="M673.56,324q-6.84,1.89-18.4,4.24a144.38,144.38,0,0,1-28.3,2.36q-13.68,0-22.88-4a37.07,37.07,0,0,1-14.86-11.32A45.88,45.88,0,0,1,581,297.53a98.64,98.64,0,0,1-2.47-22.88v-68.4h15.33V269.7a108.25,108.25,0,0,0,1.88,21.93q1.89,9,6.14,14.51a23.86,23.86,0,0,0,11,8,47.64,47.64,0,0,0,16.39,2.48,132.49,132.49,0,0,0,18.87-1.18c5.34-.79,8.73-1.5,10.14-2.13V206.25h15.33Z"/><path class="cls-3" d="M710.26,210.49q6.84-1.87,18.4-4.24a144.38,144.38,0,0,1,28.3-2.36q13.92,0,23.24,4a35.73,35.73,0,0,1,14.86,11.44,46.84,46.84,0,0,1,7.9,17.81A103.44,103.44,0,0,1,805.32,260v68.16H790V265A115.58,115.58,0,0,0,788.22,243a36.61,36.61,0,0,0-5.9-14.62,23,23,0,0,0-10.85-8.14q-6.72-2.47-16.87-2.47A128.49,128.49,0,0,0,735.85,219q-7.9,1.17-10.26,2.12V328.19H710.26Z"/><path class="cls-3" d="M855.39,206.25H904v13H855.39v64.87A65.79,65.79,0,0,0,857.16,301a23.36,23.36,0,0,0,5.07,10,16,16,0,0,0,8,4.72,42.53,42.53,0,0,0,10.38,1.18q9.66,0,15.56-2.24a67,67,0,0,0,9.2-4.13l3.78,12.74q-3.31,2.13-11.56,4.83a57.11,57.11,0,0,1-17.93,2.72q-11.32,0-19-3a27.48,27.48,0,0,1-12.26-9,36.72,36.72,0,0,1-6.49-15,104.2,104.2,0,0,1-1.88-21.23V170.4l15.33-2.83Z"/><path class="cls-3" d="M1023.33,324q-6.86,1.89-18.4,4.24a144.49,144.49,0,0,1-28.31,2.36q-13.68,0-22.88-4a37.14,37.14,0,0,1-14.86-11.32,45.87,45.87,0,0,1-8.13-17.69,98.62,98.62,0,0,1-2.48-22.88v-68.4H943.6V269.7a108.17,108.17,0,0,0,1.89,21.93q1.89,9,6.13,14.51a23.91,23.91,0,0,0,11,8A47.64,47.64,0,0,0,979,316.64a132.49,132.49,0,0,0,18.87-1.18q8-1.18,10.14-2.13V206.25h15.34Z"/><path class="cls-3" d="M1156.68,163.32q34.68,0,51.66,13.21t17,37.5q0,13.92-5,23.71a40.35,40.35,0,0,1-14.15,15.8q-9.21,6-22.53,8.73a151.33,151.33,0,0,1-30.07,2.71h-22.17v63.21h-16V167.8a115.14,115.14,0,0,1,19.93-3.42Q1146.77,163.32,1156.68,163.32Zm.71,13.92q-9,0-15.21.59t-10.73,1.06v72.17h20.28a163.68,163.68,0,0,0,23.47-1.53,52.38,52.38,0,0,0,17.93-5.66,28.63,28.63,0,0,0,11.44-11.44q4-7.31,4-18.63,0-10.85-4.37-17.93a32.14,32.14,0,0,0-11.56-11.2,50.62,50.62,0,0,0-16.39-5.78A106.64,106.64,0,0,0,1157.39,177.24Z"/><path class="cls-3" d="M1292.85,203.89a82.18,82.18,0,0,1,14.27,1.18,43.81,43.81,0,0,1,9.32,2.36l-3.07,13.21a34.1,34.1,0,0,0-7.66-2,87.42,87.42,0,0,0-15.22-1.06,71.62,71.62,0,0,0-15.92,1.42,44.62,44.62,0,0,0-7.9,2.35V328.19h-15.33V211.91a113,113,0,0,1,16.27-5.31Q1278,203.9,1292.85,203.89Z"/><path class="cls-3" d="M1438.5,267.34a78.87,78.87,0,0,1-4.13,26.18,58.25,58.25,0,0,1-11.56,20.05,52.56,52.56,0,0,1-17.57,12.85,56.86,56.86,0,0,1-44.81,0,52.6,52.6,0,0,1-17.58-12.85,58.39,58.39,0,0,1-11.55-20.05,85,85,0,0,1,0-52.36A59.72,59.72,0,0,1,1342.85,221a51.86,51.86,0,0,1,17.58-13,56.86,56.86,0,0,1,44.81,0,51.82,51.82,0,0,1,17.57,13,59.57,59.57,0,0,1,11.56,20.17A78.87,78.87,0,0,1,1438.5,267.34Zm-16.28,0q0-22.87-10.61-36.44t-28.78-13.57q-18.16,0-28.77,13.57t-10.62,36.44q0,22.88,10.62,36.32t28.77,13.45q18.17,0,28.78-13.45T1422.22,267.34Z"/></svg>
\ No newline at end of file
diff --git a/gnome-initial-setup/pages/ubuntu-pro/ubuntupro.gresource.xml b/gnome-initial-setup/pages/ubuntu-pro/ubuntupro.gresource.xml
new file mode 100644
index 0000000..9257186
--- /dev/null
+++ b/gnome-initial-setup/pages/ubuntu-pro/ubuntupro.gresource.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/initial-setup">
+    <file preprocess="xml-stripblanks" alias="gis-ubuntupro-page.ui">gis-ubuntupro-page.ui</file>
+    <file preprocess="xml-stripblanks" alias="gis-ubuntupro-offer-page.ui">gis-ubuntupro-offer-page.ui</file>
+    <file preprocess="xml-stripblanks" alias="gis-ubuntupro-attach-page.ui">gis-ubuntupro-attach-page.ui</file>
+    <file preprocess="xml-stripblanks" alias="gis-ubuntupro-services-page.ui">gis-ubuntupro-services-page.ui</file>
+    <file alias="ubuntu-pro-dark.svg">ubuntu-pro-dark.svg</file>
+    <file alias="ubuntu-pro.svg">ubuntu-pro.svg</file>
+    <file alias="checkmark.svg">checkmark.svg</file>
+    <file alias="fail.svg">fail.svg</file>
+  </gresource>
+</gresources>
+
diff --git a/gnome-initial-setup/pages/ubuntu-pro/utils.c b/gnome-initial-setup/pages/ubuntu-pro/utils.c
new file mode 100644
index 0000000..e2f1509
--- /dev/null
+++ b/gnome-initial-setup/pages/ubuntu-pro/utils.c
@@ -0,0 +1,123 @@
+#include <libsoup/soup.h>
+#include "gis-ubuntupro-page.h"
+
+gboolean
+parse_ua_status(gchar **contents, gsize *len)
+{
+    g_autoptr(GError) error = NULL;
+
+    if (!g_file_get_contents("/var/lib/ubuntu-advantage/status.json",
+                             contents, len, &error)) {
+        g_warning("Unable to read pro status: %s\n", error->message);
+        return FALSE;
+    }
+    return TRUE;
+}
+
+gboolean
+get_ubuntu_advantage_attached(gboolean *attached)
+{
+  g_autoptr(GError) error = NULL;
+  g_autoptr(GDBusConnection) bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
+  if (bus == NULL) {
+    g_warning ("Failed to get system bus: %s", error->message);
+    return FALSE;
+  }
+
+  g_autoptr(GVariant) result = g_dbus_connection_call_sync (bus,
+      "com.canonical.UbuntuAdvantage",
+      "/com/canonical/UbuntuAdvantage/Manager",
+      "org.freedesktop.DBus.Properties",
+      "Get",
+      g_variant_new ("(ss)", "com.canonical.UbuntuAdvantage.Manager", "Attached"),
+      G_VARIANT_TYPE ("(v)"),
+      G_DBUS_CALL_FLAGS_NONE,
+      -1,
+      NULL,
+      &error);
+  if (result == NULL) {
+    g_warning ("Failed to contact Ubuntu Advantage D-Bus service: %s", error->message);
+    return FALSE;
+  }
+
+  g_autoptr(GVariant) value = NULL;
+  g_variant_get (result, "(v)", &value);
+  if (!g_variant_is_of_type (value, G_VARIANT_TYPE("b"))) {
+    g_warning ("Attached property has wrong type");
+    return FALSE;
+  }
+  g_variant_get (value, "b", attached);
+
+  return TRUE;
+}
+
+char *
+get_item (const char *buffer, const char *name)
+{
+  g_autofree gchar *label = NULL;
+  gchar *start = NULL, *end = NULL;
+  gchar end_char;
+
+  label = g_strconcat (name, "=", NULL);
+  if ((start = strstr (buffer, label)) != NULL) {
+    start += strlen (label);
+    end_char = '\n';
+    if (*start == '"') {
+      start++;
+      end_char = '"';
+    }
+    end = strchr (start, end_char);
+  }
+
+  if (start != NULL && end != NULL)
+    return g_strndup (start, end - start);
+  else
+    return NULL;
+}
+
+gboolean
+is_lts ()
+{
+  g_autofree gchar *buffer = NULL;
+  g_autofree gchar *version = NULL;
+
+  if (g_file_get_contents ("/etc/os-release", &buffer, NULL, NULL))
+    version = get_item (buffer, "VERSION");
+
+  return version && g_strrstr (version, "LTS") != NULL;
+}
+
+gboolean
+is_ubuntupro_supported ()
+{
+  return is_lts ();
+}
+
+/* Routine from Gnome Control Center
+ * https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/a3b8964a */
+gboolean
+is_dark_theme (GtkWidget *widget)
+{
+  GdkScreen *screen;
+  GtkSettings *settings;
+  g_autofree char *theme_name = NULL;
+
+  theme_name = g_strdup (g_getenv ("GTK_THEME"));
+  if (theme_name != NULL) {
+    return g_str_has_suffix (theme_name, "dark");
+  }
+
+  screen = gtk_widget_get_screen (GTK_WIDGET (widget));
+  settings = gtk_settings_get_for_screen (screen);
+
+  g_object_get (settings, "gtk-theme-name", &theme_name, NULL);
+  return theme_name != NULL && g_str_has_suffix (theme_name, "dark");
+}
+
+void
+itemize(gchar *str, const gchar *append, gsize len)
+{
+  g_strlcat(str, "• ", len);
+  g_strlcat(str, append, len);
+  g_strlcat(str, "\n", len);
+}
diff --git a/gnome-initial-setup/pages/ubuntu-pro/utils.h b/gnome-initial-setup/pages/ubuntu-pro/utils.h
new file mode 100644
index 0000000..ceefe72
--- /dev/null
+++ b/gnome-initial-setup/pages/ubuntu-pro/utils.h
@@ -0,0 +1,7 @@
+gboolean parse_ua_status(gchar**, gsize*);
+gboolean get_ubuntu_advantage_attached(gboolean*);
+char *get_item(const char*, const char*);
+gboolean is_lts();
+gboolean is_ubuntupro_supported();
+gboolean is_dark_theme(GtkWidget*);
+void itemize(gchar*, const gchar*, gsize);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9b1b23f..43dbabb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,3 @@
-data/com.ubuntu.welcome.policy.in
 data/gnome-initial-setup-first-login.desktop.in.in
 data/gnome-initial-setup.desktop.in.in
 gnome-initial-setup/cc-common-language.c
@@ -37,17 +36,16 @@ gnome-initial-setup/pages/software/gis-software-page.c
 gnome-initial-setup/pages/software/gis-software-page.ui
 gnome-initial-setup/pages/summary/gis-summary-page.c
 gnome-initial-setup/pages/summary/gis-summary-page.ui
-gnome-initial-setup/pages/timezone/gis-location-entry.c
 gnome-initial-setup/pages/timezone/gis-timezone-page.c
 gnome-initial-setup/pages/timezone/gis-timezone-page.ui
+gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-attach-page.ui
+gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-offer-page.ui
+gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-page.c
+gnome-initial-setup/pages/ubuntu-pro/gis-ubuntupro-services-page.ui
 gnome-initial-setup/pages/welcome/gis-welcome-page.c
 gnome-initial-setup/pages/welcome/gis-welcome-page.ui
 gnome-initial-setup/pages/timezone/gis-timezone-page.ui
 gnome-initial-setup/pages/ubuntu-report/gis-ubuntu-report-page.c
 gnome-initial-setup/pages/ubuntu-report/gis-ubuntu-report-page.ui
-gnome-initial-setup/pages/livepatch/gis-auth-dialog.c
-gnome-initial-setup/pages/livepatch/gis-auth-dialog.ui
-gnome-initial-setup/pages/livepatch/gis-livepatch-page.c
-gnome-initial-setup/pages/livepatch/gis-livepatch-page.ui
 gnome-initial-setup/pages/apps/gis-apps-page.c
 gnome-initial-setup/pages/apps/gis-apps-page.ui