diff --git a/.github/workflows/qa-release.yml b/.github/workflows/qa-release.yml
index 5537da04c..1c6713a98 100644
--- a/.github/workflows/qa-release.yml
+++ b/.github/workflows/qa-release.yml
@@ -50,7 +50,7 @@ jobs:
         uses: eskatos/gradle-command-action@v1.3.3
         with:
           # Can be overridden with the desired gradle version
-          gradle-version: 7.2
+          gradle-version: 7.3.3
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index ce6671bb2..b241139ff 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -46,5 +46,10 @@
       <option name="name" value="MavenRepo" />
       <option name="url" value="https://repo.maven.apache.org/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven5" />
+      <option name="name" value="maven5" />
+      <option name="url" value="https://sdk.uxcam.com/android/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 873900ca6..175a9b489 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -10,13 +10,24 @@
       <map>
         <entry key="../../../../layout/compose-model-1647504975633.xml" value="0.2673141891891892" />
         <entry key="../../../../layout/compose-model-1648556434513.xml" value="0.24957770270270271" />
+        <entry key="app/src/main/res/drawable/banner_gist.xml" value="0.2535" />
+        <entry key="app/src/main/res/drawable/banner_permission.xml" value="0.2535" />
+        <entry key="app/src/main/res/drawable/banner_roundupnews.xml" value="0.2535" />
+        <entry key="app/src/main/res/drawable/banner_upvote.xml" value="0.2535" />
+        <entry key="app/src/main/res/drawable/blue_cornered_background.xml" value="0.258" />
+        <entry key="app/src/main/res/drawable/border_entry.xml" value="0.2535" />
         <entry key="app/src/main/res/drawable/bright_blue_rounded_bg.xml" value="0.1" />
+        <entry key="app/src/main/res/drawable/bubble_left.xml" value="0.2535" />
         <entry key="app/src/main/res/drawable/button_bg_colored.xml" value="0.32037037037037036" />
         <entry key="app/src/main/res/drawable/button_bg_dark.xml" value="0.32037037037037036" />
         <entry key="app/src/main/res/drawable/button_bg_grey.xml" value="0.32037037037037036" />
+        <entry key="app/src/main/res/drawable/dialog_bg.xml" value="0.2535" />
+        <entry key="app/src/main/res/drawable/ic_baseline_open_in_new_16.xml" value="0.258" />
         <entry key="app/src/main/res/drawable/ic_close.xml" value="0.2601851851851852" />
         <entry key="app/src/main/res/drawable/ic_copy.xml" value="0.182" />
+        <entry key="app/src/main/res/drawable/ic_error.xml" value="0.137" />
         <entry key="app/src/main/res/drawable/ic_grey_circle_small.xml" value="0.249" />
+        <entry key="app/src/main/res/drawable/ic_info_red.xml" value="0.137" />
         <entry key="app/src/main/res/drawable/ic_noun_hashtag_2733013.xml" value="0.175" />
         <entry key="app/src/main/res/drawable/ic_payment.xml" value="0.6125" />
         <entry key="app/src/main/res/drawable/ic_refresh_white_13dp.xml" value="0.25833333333333336" />
@@ -28,7 +39,18 @@
         <entry key="app/src/main/res/drawable/ic_system_upate_24.xml" value="0.6125" />
         <entry key="app/src/main/res/drawable/ic_ussd_lib.xml" value="0.3546875" />
         <entry key="app/src/main/res/drawable/icon_bg_circle.xml" value="0.2295" />
+        <entry key="app/src/main/res/drawable/img_check.xml" value="0.2535" />
+        <entry key="app/src/main/res/drawable/img_copy.xml" value="0.2535" />
+        <entry key="app/src/main/res/drawable/img_sms.xml" value="0.2535" />
+        <entry key="app/src/main/res/drawable/img_whatsapp.xml" value="0.2535" />
+        <entry key="app/src/main/res/drawable/info_offwhite.xml" value="0.2535" />
+        <entry key="app/src/main/res/drawable/processing_background.xml" value="0.2535" />
+        <entry key="app/src/main/res/drawable/processing_card_background.xml" value="0.2535" />
+        <entry key="app/src/main/res/drawable/selector_icon_tint.xml" value="0.2535" />
+        <entry key="app/src/main/res/drawable/spinner_state_selector.xml" value="0.2535" />
         <entry key="app/src/main/res/drawable/splash_window_background.xml" value="0.2395" />
+        <entry key="app/src/main/res/drawable/text_btn_selector.xml" value="0.2535" />
+        <entry key="app/src/main/res/drawable/transparent_bg.xml" value="0.2535" />
         <entry key="app/src/main/res/font/brutalista_font.xml" value="0.47265625" />
         <entry key="app/src/main/res/layout/account_card_layout.xml" value="0.25" />
         <entry key="app/src/main/res/layout/account_card_manage.xml" value="0.30572916666666666" />
@@ -47,6 +69,7 @@
         <entry key="app/src/main/res/layout/bounty_card_channel.xml" value="0.30510752688172044" />
         <entry key="app/src/main/res/layout/bounty_list_item.xml" value="0.48828125" />
         <entry key="app/src/main/res/layout/bounty_retry_submit_btn_layout.xml" value="0.30510752688172044" />
+        <entry key="app/src/main/res/layout/card_bonuses.xml" value="0.33" />
         <entry key="app/src/main/res/layout/card_wellness_tips.xml" value="0.31657608695652173" />
         <entry key="app/src/main/res/layout/contact_input.xml" value="0.15678824721377912" />
         <entry key="app/src/main/res/layout/contact_stax_layout.xml" value="0.30510752688172044" />
@@ -83,7 +106,7 @@
         <entry key="app/src/main/res/layout/fragment_schedule.xml" value="0.2056159420289855" />
         <entry key="app/src/main/res/layout/fragment_settings.xml" value="0.30510752688172044" />
         <entry key="app/src/main/res/layout/fragment_signin_variant.xml" value="0.30510752688172044" />
-        <entry key="app/src/main/res/layout/fragment_transaction.xml" value="0.1" />
+        <entry key="app/src/main/res/layout/fragment_transaction.xml" value="0.22916666666666666" />
         <entry key="app/src/main/res/layout/fragment_transfer.xml" value="0.21" />
         <entry key="app/src/main/res/layout/fragment_wellness.xml" value="0.14492753623188406" />
         <entry key="app/src/main/res/layout/fragment_wellness_detail.xml" value="0.165" />
@@ -92,6 +115,7 @@
         <entry key="app/src/main/res/layout/home_card_header.xml" value="0.2905982905982906" />
         <entry key="app/src/main/res/layout/home_card_transactions.xml" value="0.14766970618034447" />
         <entry key="app/src/main/res/layout/in_app_banner_layout.xml" value="0.15704154002026344" />
+        <entry key="app/src/main/res/layout/info_text_layout.xml" value="0.2905982905982906" />
         <entry key="app/src/main/res/layout/input_item.xml" value="0.2125" />
         <entry key="app/src/main/res/layout/item_icons.xml" value="0.19145299145299147" />
         <entry key="app/src/main/res/layout/item_paybill.xml" value="0.19145299145299147" />
@@ -135,6 +159,7 @@
         <entry key="app/src/main/res/layout/settings_card_support.xml" value="0.19145299145299147" />
         <entry key="app/src/main/res/layout/settings_card_ussd_library.xml" value="0.19145299145299147" />
         <entry key="app/src/main/res/layout/settings_security_card.xml" value="0.19145299145299147" />
+        <entry key="app/src/main/res/layout/share_excitement_layout.xml" value="0.1983695652173913" />
         <entry key="app/src/main/res/layout/splash_screen_layout.xml" value="0.19145299145299147" />
         <entry key="app/src/main/res/layout/stack_balance_card.xml" value="0.19145299145299147" />
         <entry key="app/src/main/res/layout/stax_2lineitem.xml" value="0.11956521739130435" />
@@ -150,12 +175,12 @@
         <entry key="app/src/main/res/layout/stax_spinner_2line.xml" value="0.19145299145299147" />
         <entry key="app/src/main/res/layout/stax_spinner_item.xml" value="0.30625" />
         <entry key="app/src/main/res/layout/stax_spinner_item_with_logo.xml" value="0.13134057971014493" />
-        <entry key="app/src/main/res/layout/summarycard_nontemplate_items.xml" value="0.42734375" />
+        <entry key="app/src/main/res/layout/summarycard_nontemplate_items.xml" value="0.19610507246376813" />
         <entry key="app/src/main/res/layout/support_stax_layout.xml" value="0.1646403242147923" />
         <entry key="app/src/main/res/layout/transaction_card_history.xml" value="0.19145299145299147" />
         <entry key="app/src/main/res/layout/transaction_details_info_card.xml" value="0.22" />
         <entry key="app/src/main/res/layout/transaction_details_primarystatus.xml" value="0.20643363728470113" />
-        <entry key="app/src/main/res/layout/transaction_details_secondary_status.xml" value="0.1" />
+        <entry key="app/src/main/res/layout/transaction_details_secondary_status.xml" value="0.22916666666666666" />
         <entry key="app/src/main/res/layout/transaction_details_topstatus_view.xml" value="0.35733695652173914" />
         <entry key="app/src/main/res/layout/transaction_list_item.xml" value="0.33" />
         <entry key="app/src/main/res/layout/transaction_messages_items.xml" value="0.19145299145299147" />
@@ -186,7 +211,7 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 35111bfeb..646ca5827 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,8 +45,8 @@ android {
         applicationId "com.hover.stax"
         minSdk 21
         targetSdk 31
-        versionCode 133
-        versionName "1.10.1"
+        versionCode 142
+        versionName "1.11.4"
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
@@ -114,6 +114,7 @@ android {
     lint {
         disable 'MissingTranslation', 'ExtraTranslation'
     }
+    namespace 'com.hover.stax'
 }
 
 
@@ -196,6 +197,9 @@ dependencies {
     debugImplementation project(":hover.sdk")
     def sdk_version = "2.0.0-stax-1.10.1-pro"
 
+    // UXCam
+    implementation 'com.uxcam:uxcam:3.3.7@aar'
+
     releaseImplementation "com.hover:android-sdk:$sdk_version"
 
     debugImplementation 'com.android.volley:volley:1.2.1'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 4cab870f1..e0d142ed2 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -34,3 +34,6 @@
   public *;
 }
 -dontwarn com.bumptech.glide.load.resource.bitmap.VideoDecoder
+
+-keep class com.uxcam.** { *; }
+-dontwarn com.uxcam.**
\ No newline at end of file
diff --git a/app/schemas/com.hover.stax.database.AppDatabase/39.json b/app/schemas/com.hover.stax.database.AppDatabase/39.json
new file mode 100644
index 000000000..e91fb7369
--- /dev/null
+++ b/app/schemas/com.hover.stax.database.AppDatabase/39.json
@@ -0,0 +1,846 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 39,
+    "identityHash": "20d754ea921bd26d6f1996cb90a140d9",
+    "entities": [
+      {
+        "tableName": "channels",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `country_alpha2` TEXT NOT NULL, `root_code` TEXT, `currency` TEXT NOT NULL, `hni_list` TEXT NOT NULL, `logo_url` TEXT NOT NULL, `institution_id` INTEGER NOT NULL, `primary_color_hex` TEXT NOT NULL, `published` INTEGER NOT NULL DEFAULT 0, `secondary_color_hex` TEXT NOT NULL, `selected` INTEGER NOT NULL DEFAULT 0, `defaultAccount` INTEGER NOT NULL DEFAULT 0, `pin` TEXT, `latestBalance` TEXT, `latestBalanceTimestamp` INTEGER DEFAULT CURRENT_TIMESTAMP, `account_no` TEXT, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "countryAlpha2",
+            "columnName": "country_alpha2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "rootCode",
+            "columnName": "root_code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hniList",
+            "columnName": "hni_list",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "logoUrl",
+            "columnName": "logo_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "institutionId",
+            "columnName": "institution_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryColorHex",
+            "columnName": "primary_color_hex",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "published",
+            "columnName": "published",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "secondaryColorHex",
+            "columnName": "secondary_color_hex",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "selected",
+            "columnName": "selected",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "defaultAccount",
+            "columnName": "defaultAccount",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "pin",
+            "columnName": "pin",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "latestBalance",
+            "columnName": "latestBalance",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "latestBalanceTimestamp",
+            "columnName": "latestBalanceTimestamp",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "CURRENT_TIMESTAMP"
+          },
+          {
+            "fieldPath": "accountNo",
+            "columnName": "account_no",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "stax_transactions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `uuid` TEXT NOT NULL, `action_id` TEXT NOT NULL, `environment` INTEGER NOT NULL DEFAULT 0, `transaction_type` TEXT NOT NULL, `channel_id` INTEGER NOT NULL, `status` TEXT NOT NULL DEFAULT 'pending', `category` TEXT, `initiated_at` INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, `updated_at` INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, `description` TEXT, `amount` REAL, `fee` REAL, `confirm_code` TEXT, `recipient_id` TEXT, `balance` TEXT, `account_id` INTEGER, `counterparty` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uuid",
+            "columnName": "uuid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "action_id",
+            "columnName": "action_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "environment",
+            "columnName": "environment",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "transaction_type",
+            "columnName": "transaction_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "channel_id",
+            "columnName": "channel_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'pending'"
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "initiated_at",
+            "columnName": "initiated_at",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "CURRENT_TIMESTAMP"
+          },
+          {
+            "fieldPath": "updated_at",
+            "columnName": "updated_at",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "CURRENT_TIMESTAMP"
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "confirm_code",
+            "columnName": "confirm_code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "counterparty_id",
+            "columnName": "recipient_id",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "balance",
+            "columnName": "balance",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "accountId",
+            "columnName": "account_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "counterparty",
+            "columnName": "counterparty",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_stax_transactions_uuid",
+            "unique": true,
+            "columnNames": [
+              "uuid"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_stax_transactions_uuid` ON `${TABLE_NAME}` (`uuid`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "stax_contacts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `lookup_key` TEXT, `name` TEXT, `aliases` TEXT, `phone_number` TEXT, `thumb_uri` TEXT, `last_used_timestamp` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lookupKey",
+            "columnName": "lookup_key",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "aliases",
+            "columnName": "aliases",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "accountNumber",
+            "columnName": "phone_number",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "thumbUri",
+            "columnName": "thumb_uri",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastUsedTimestamp",
+            "columnName": "last_used_timestamp",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_stax_contacts_id",
+            "unique": true,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_stax_contacts_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_stax_contacts_phone_number",
+            "unique": true,
+            "columnNames": [
+              "phone_number"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_stax_contacts_phone_number` ON `${TABLE_NAME}` (`phone_number`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "requests",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `description` TEXT, `requestee_ids` TEXT NOT NULL, `amount` TEXT, `requester_institution_id` INTEGER NOT NULL, `requester_number` TEXT, `note` TEXT, `message` TEXT, `matched_transaction_uuid` TEXT, `date_sent` INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "requestee_ids",
+            "columnName": "requestee_ids",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "requester_institution_id",
+            "columnName": "requester_institution_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "requester_number",
+            "columnName": "requester_number",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "message",
+            "columnName": "message",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "matched_transaction_uuid",
+            "columnName": "matched_transaction_uuid",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date_sent",
+            "columnName": "date_sent",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "CURRENT_TIMESTAMP"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "schedules",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `type` TEXT NOT NULL, `channel_id` INTEGER NOT NULL, `action_id` TEXT, `recipient_ids` TEXT NOT NULL, `amount` TEXT, `note` TEXT, `description` TEXT NOT NULL, `start_date` INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, `end_date` INTEGER DEFAULT CURRENT_TIMESTAMP, `frequency` INTEGER NOT NULL, `complete` INTEGER NOT NULL DEFAULT false)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "channel_id",
+            "columnName": "channel_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "action_id",
+            "columnName": "action_id",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "recipient_ids",
+            "columnName": "recipient_ids",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start_date",
+            "columnName": "start_date",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "CURRENT_TIMESTAMP"
+          },
+          {
+            "fieldPath": "end_date",
+            "columnName": "end_date",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "CURRENT_TIMESTAMP"
+          },
+          {
+            "fieldPath": "frequency",
+            "columnName": "frequency",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "complete",
+            "columnName": "complete",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "accounts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `alias` TEXT NOT NULL, `logo_url` TEXT NOT NULL, `account_no` TEXT, `channelId` INTEGER NOT NULL, `primary_color_hex` TEXT NOT NULL, `secondary_color_hex` TEXT NOT NULL, `isDefault` INTEGER NOT NULL DEFAULT 0, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `latestBalance` TEXT, `latestBalanceTimestamp` INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, FOREIGN KEY(`channelId`) REFERENCES `channels`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "alias",
+            "columnName": "alias",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "logoUrl",
+            "columnName": "logo_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accountNo",
+            "columnName": "account_no",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "channelId",
+            "columnName": "channelId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryColorHex",
+            "columnName": "primary_color_hex",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondaryColorHex",
+            "columnName": "secondary_color_hex",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDefault",
+            "columnName": "isDefault",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latestBalance",
+            "columnName": "latestBalance",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "latestBalanceTimestamp",
+            "columnName": "latestBalanceTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "CURRENT_TIMESTAMP"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_accounts_name",
+            "unique": true,
+            "columnNames": [
+              "name"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_accounts_name` ON `${TABLE_NAME}` (`name`)"
+          },
+          {
+            "name": "index_accounts_channelId",
+            "unique": false,
+            "columnNames": [
+              "channelId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_accounts_channelId` ON `${TABLE_NAME}` (`channelId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "channels",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "channelId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "paybills",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `business_no` TEXT NOT NULL, `account_no` TEXT, `channelId` INTEGER NOT NULL, `accountId` INTEGER NOT NULL, `logo_url` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `recurring_amount` INTEGER NOT NULL, `logo` INTEGER NOT NULL, `isSaved` INTEGER NOT NULL DEFAULT 0, FOREIGN KEY(`channelId`) REFERENCES `channels`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`accountId`) REFERENCES `accounts`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "businessNo",
+            "columnName": "business_no",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accountNo",
+            "columnName": "account_no",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "channelId",
+            "columnName": "channelId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accountId",
+            "columnName": "accountId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "logoUrl",
+            "columnName": "logo_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "recurringAmount",
+            "columnName": "recurring_amount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "logo",
+            "columnName": "logo",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isSaved",
+            "columnName": "isSaved",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_paybills_business_no_account_no",
+            "unique": true,
+            "columnNames": [
+              "business_no",
+              "account_no"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_paybills_business_no_account_no` ON `${TABLE_NAME}` (`business_no`, `account_no`)"
+          },
+          {
+            "name": "index_paybills_channelId",
+            "unique": false,
+            "columnNames": [
+              "channelId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_paybills_channelId` ON `${TABLE_NAME}` (`channelId`)"
+          },
+          {
+            "name": "index_paybills_accountId",
+            "unique": false,
+            "columnNames": [
+              "accountId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_paybills_accountId` ON `${TABLE_NAME}` (`accountId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "channels",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "channelId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "accounts",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "accountId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "stax_users",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `username` TEXT NOT NULL, `email` TEXT NOT NULL, `isMapper` INTEGER NOT NULL DEFAULT 0, `marketingOptedIn` INTEGER NOT NULL DEFAULT 0, `transactionCount` INTEGER NOT NULL, `bountyTotal` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isMapper",
+            "columnName": "isMapper",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "marketingOptedIn",
+            "columnName": "marketingOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "transactionCount",
+            "columnName": "transactionCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bountyTotal",
+            "columnName": "bountyTotal",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "bonuses",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_channel` INTEGER NOT NULL, `purchase_channel` INTEGER NOT NULL, `bonus_percent` REAL NOT NULL, `message` TEXT NOT NULL, PRIMARY KEY(`user_channel`, `purchase_channel`))",
+        "fields": [
+          {
+            "fieldPath": "userChannel",
+            "columnName": "user_channel",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "purchaseChannel",
+            "columnName": "purchase_channel",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bonusPercent",
+            "columnName": "bonus_percent",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "message",
+            "columnName": "message",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "user_channel",
+            "purchase_channel"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '20d754ea921bd26d6f1996cb90a140d9')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/hover/stax/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/hover/stax/ExampleInstrumentedTest.java
index 80dcc8d43..68fa22962 100644
--- a/app/src/androidTest/java/com/hover/stax/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/hover/stax/ExampleInstrumentedTest.java
@@ -1,15 +1,15 @@
 package com.hover.stax;
 
+import static org.junit.Assert.assertEquals;
+
 import android.content.Context;
 
-import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
diff --git a/app/src/main/java/com/hover/stax/ApplicationInstance.kt b/app/src/main/java/com/hover/stax/ApplicationInstance.kt
index 9b0f42794..020a85a12 100644
--- a/app/src/main/java/com/hover/stax/ApplicationInstance.kt
+++ b/app/src/main/java/com/hover/stax/ApplicationInstance.kt
@@ -2,7 +2,6 @@ package com.hover.stax
 
 import android.app.Application
 import android.content.ComponentCallbacks
-import androidx.annotation.RequiresApi
 import com.appsflyer.AppsFlyerConversionListener
 import com.appsflyer.AppsFlyerLib
 import com.appsflyer.AppsFlyerProperties
@@ -13,6 +12,7 @@ import com.hover.stax.database.appModule
 import com.hover.stax.database.dataModule
 import com.hover.stax.database.networkModule
 import com.hover.stax.utils.network.NetworkMonitor
+import com.uxcam.UXCam
 import com.yariksoffice.lingver.Lingver
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
@@ -32,6 +32,7 @@ class ApplicationInstance : Application() {
         initFirebase()
 
         initAppsFlyer()
+        initUxCam()
     }
 
     private fun initFirebase() {
@@ -50,6 +51,8 @@ class ApplicationInstance : Application() {
         }
     }
 
+    private fun initUxCam() = UXCam.startWithKey(getString(R.string.uxcam_key))
+
     private fun setLogger() {
         if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree()) else Timber.uprootAll()
     }
@@ -83,6 +86,7 @@ class ApplicationInstance : Application() {
         }
     }
 
+
     companion object {
         val txnDetailsRetryCounter: MutableMap<String, Int> by Delegates.observable(HashMap()) { _, _, _ -> }
     }
diff --git a/app/src/main/java/com/hover/stax/accounts/Account.kt b/app/src/main/java/com/hover/stax/accounts/Account.kt
index 1228017b5..342513adf 100644
--- a/app/src/main/java/com/hover/stax/accounts/Account.kt
+++ b/app/src/main/java/com/hover/stax/accounts/Account.kt
@@ -1,7 +1,6 @@
 package com.hover.stax.accounts
 
 import androidx.room.*
-import androidx.room.ForeignKey.CASCADE
 import com.hover.stax.channels.Channel
 import com.hover.stax.utils.DateUtils.now
 import timber.log.Timber
diff --git a/app/src/main/java/com/hover/stax/accounts/AccountDropdown.kt b/app/src/main/java/com/hover/stax/accounts/AccountDropdown.kt
index a8d8bf619..44cf782f2 100644
--- a/app/src/main/java/com/hover/stax/accounts/AccountDropdown.kt
+++ b/app/src/main/java/com/hover/stax/accounts/AccountDropdown.kt
@@ -49,7 +49,7 @@ class AccountDropdown(context: Context, attributeSet: AttributeSet) : StaxDropdo
     }
 
     private fun accountUpdate(accounts: List<Account>) {
-        if (!accounts.isNullOrEmpty()) {
+        if (accounts.isNotEmpty()) {
             updateChoices(accounts)
         } else if (!hasExistingContent()) {
             setState(context.getString(R.string.accounts_error_no_accounts), NONE)
@@ -90,11 +90,11 @@ class AccountDropdown(context: Context, attributeSet: AttributeSet) : StaxDropdo
         }
     }
 
-    fun setCurrentAccount() = onSelect(accountList.firstOrNull { it.isDefault })
+    fun setCurrentAccount(account: Account? = null, channelId: Int = 0) = onSelect(account ?: accountList.firstOrNull { it.isDefault }, channelId)
 
-    private fun onSelect(account: Account?) {
+    private fun onSelect(account: Account?, channelOverride: Int = 0) {
         setDropdownValue(account)
-        account?.let { highlightListener?.highlightAccount(it) }
+        account?.let { highlightListener?.highlightAccount(it, channelOverride) }
     }
 
     private fun hasExistingContent(): Boolean = autoCompleteTextView.adapter != null && autoCompleteTextView.adapter.count > 0
@@ -135,14 +135,14 @@ class AccountDropdown(context: Context, attributeSet: AttributeSet) : StaxDropdo
 
     private fun setState(actions: List<HoverAction>, viewModel: ChannelsViewModel) {
         when {
-            viewModel.activeChannel.value != null && (actions.isNullOrEmpty()) -> setState(
+            viewModel.activeChannel.value != null && (actions.isEmpty()) -> setState(
                 context.getString(
                     R.string.no_actions_fielderror,
                     HoverAction.getHumanFriendlyType(context, viewModel.getActionType())
                 ), ERROR
             )
 
-            !actions.isNullOrEmpty() && actions.size == 1 && !actions.first().requiresRecipient() && viewModel.getActionType() != HoverAction.BALANCE ->
+            actions.isNotEmpty() && actions.size == 1 && !actions.first().requiresRecipient() && viewModel.getActionType() != HoverAction.BALANCE ->
                 setState(
                     context.getString(
                         if (actions.first().transaction_type == HoverAction.AIRTIME) R.string.self_only_airtime_warning
@@ -159,7 +159,7 @@ class AccountDropdown(context: Context, attributeSet: AttributeSet) : StaxDropdo
     }
 
     interface HighlightListener {
-        fun highlightAccount(account: Account)
+        fun highlightAccount(account: Account, channelOverride: Int = 0)
     }
 
     interface AccountFetchListener {
diff --git a/app/src/main/java/com/hover/stax/accounts/AccountDropdownAdapter.kt b/app/src/main/java/com/hover/stax/accounts/AccountDropdownAdapter.kt
index 999f5e1c0..a27de5639 100644
--- a/app/src/main/java/com/hover/stax/accounts/AccountDropdownAdapter.kt
+++ b/app/src/main/java/com/hover/stax/accounts/AccountDropdownAdapter.kt
@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import com.hover.stax.databinding.StaxSpinnerItemWithLogoBinding
 import com.hover.stax.utils.UIHelper
+import com.hover.stax.utils.UIHelper.loadImage
 
 class AccountDropdownAdapter(val accounts: List<Account>, context: Context) : ArrayAdapter<Account>(context, 0, accounts) {
 
@@ -38,8 +39,7 @@ class AccountDropdownAdapter(val accounts: List<Account>, context: Context) : Ar
 
         fun setAccount(account: Account) {
             binding.serviceItemNameId.text = account.alias
-
-            UIHelper.loadImage(binding.root.context, account.logoUrl, binding.serviceItemImageId)
+            binding.serviceItemImageId.loadImage(binding.root.context, account.logoUrl)
         }
 
     }
diff --git a/app/src/main/java/com/hover/stax/accounts/AccountsFragment.kt b/app/src/main/java/com/hover/stax/accounts/AccountsFragment.kt
index e11efb8d1..84e885585 100644
--- a/app/src/main/java/com/hover/stax/accounts/AccountsFragment.kt
+++ b/app/src/main/java/com/hover/stax/accounts/AccountsFragment.kt
@@ -9,6 +9,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.hover.sdk.actions.HoverAction
 import com.hover.stax.R
+import com.hover.stax.bonus.BonusViewModel
 import com.hover.stax.channels.Channel
 import com.hover.stax.channels.ChannelsAdapter
 import com.hover.stax.channels.ChannelsViewModel
@@ -17,6 +18,7 @@ import com.hover.stax.home.MainActivity
 import com.hover.stax.transfers.TransactionType
 import com.hover.stax.utils.UIHelper
 import kotlinx.coroutines.launch
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class AccountsFragment : Fragment(), ChannelsAdapter.SelectListener, AccountsAdapter.SelectListener {
@@ -24,7 +26,10 @@ class AccountsFragment : Fragment(), ChannelsAdapter.SelectListener, AccountsAda
     private var _binding: FragmentAccountsBinding? = null
     private val binding get() = _binding!!
 
-    private val viewModel: ChannelsViewModel by viewModel()
+    private val selectAdapter = ChannelsAdapter(this)
+
+    private val viewModel: ChannelsViewModel by sharedViewModel()
+    private val bonusViewModel: BonusViewModel by sharedViewModel()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         _binding = FragmentAccountsBinding.inflate(inflater, container, false)
@@ -34,8 +39,6 @@ class AccountsFragment : Fragment(), ChannelsAdapter.SelectListener, AccountsAda
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val selectAdapter = ChannelsAdapter(ArrayList(), this)
-
         binding.accountsRV.apply {
             layoutManager = UIHelper.setMainLinearManagers(requireActivity())
             adapter = selectAdapter
@@ -44,8 +47,8 @@ class AccountsFragment : Fragment(), ChannelsAdapter.SelectListener, AccountsAda
         binding.accountListCard.setOnClickIcon { findNavController().popBackStack() }
 
         with(viewModel) {
-            allChannels.observe(viewLifecycleOwner) { selectAdapter.updateList(it) }
-            simChannels.observe(viewLifecycleOwner) { selectAdapter.updateList(it) }
+            allChannels.observe(viewLifecycleOwner) { filterList(it) }
+            simChannels.observe(viewLifecycleOwner) { filterList(it) }
             accounts.observe(viewLifecycleOwner) {
                 if (it.isNotEmpty())
                     showAccountsList(it)
@@ -53,6 +56,17 @@ class AccountsFragment : Fragment(), ChannelsAdapter.SelectListener, AccountsAda
         }
     }
 
+    private fun filterList(channels:List<Channel>) {
+        val bonusChannelIds = bonusViewModel.bonuses.value?.map { it.purchaseChannel }
+
+        val list = if(!bonusChannelIds.isNullOrEmpty())
+            channels.filterNot { bonusChannelIds.contains(it.id) }
+        else
+            channels
+
+        selectAdapter.submitList(list)
+    }
+
     override fun clickedChannel(channel: Channel) {
         viewModel.setChannelsSelected(listOf(channel))
 
diff --git a/app/src/main/java/com/hover/stax/actions/ActionDropdownAdapter.kt b/app/src/main/java/com/hover/stax/actions/ActionDropdownAdapter.kt
index 883534b7d..4fcb93bf6 100644
--- a/app/src/main/java/com/hover/stax/actions/ActionDropdownAdapter.kt
+++ b/app/src/main/java/com/hover/stax/actions/ActionDropdownAdapter.kt
@@ -13,6 +13,7 @@ import com.hover.stax.R
 import com.hover.stax.accounts.Account
 import com.hover.stax.databinding.StaxSpinnerItemWithLogoBinding
 import com.hover.stax.utils.UIHelper
+import com.hover.stax.utils.UIHelper.loadImage
 
 class ActionDropdownAdapter<T>(val actions: List<T>, context: Context) : ArrayAdapter<T>(context, 0, actions) {
 
@@ -65,7 +66,7 @@ class ActionDropdownAdapter<T>(val actions: List<T>, context: Context) : ArrayAd
                 logoUrl = baseUrl.plus(action.logoUrl)
             }
 
-            UIHelper.loadImage(binding.root.context, logoUrl!!, logo!!)
+            logo!!.loadImage(binding.root.context, logoUrl!!)
         }
     }
 
diff --git a/app/src/main/java/com/hover/stax/actions/ActionSelect.kt b/app/src/main/java/com/hover/stax/actions/ActionSelect.kt
index 8e4c9cdc9..a6ca42f93 100644
--- a/app/src/main/java/com/hover/stax/actions/ActionSelect.kt
+++ b/app/src/main/java/com/hover/stax/actions/ActionSelect.kt
@@ -28,7 +28,6 @@ class ActionSelect(context: Context, attrs: AttributeSet) : LinearLayout(context
     private val binding get() = _binding!!
 
     init {
-        Timber.e("Initi action select. highlighted?: %s", highlightedAction?.id.toString())
         _binding = ActionSelectBinding.inflate(LayoutInflater.from(context), this, true)
         createListeners()
         visibility = GONE
@@ -41,8 +40,8 @@ class ActionSelect(context: Context, attrs: AttributeSet) : LinearLayout(context
     }
 
     fun updateActions(filteredActions: List<HoverAction>) {
-        visibility = if (filteredActions.isNullOrEmpty()) GONE else VISIBLE
-        if (filteredActions.isNullOrEmpty()) return
+        visibility = if (filteredActions.isEmpty()) GONE else VISIBLE
+        if (filteredActions.isEmpty()) return
 
         allActions = filteredActions
         if (!filteredActions.contains(highlightedAction))
@@ -58,7 +57,9 @@ class ActionSelect(context: Context, attrs: AttributeSet) : LinearLayout(context
 
     fun sort(actions: List<HoverAction>): List<HoverAction> = actions.distinctBy { it.to_institution_id }.toList()
 
-    private fun showRecipientNetwork(actions: List<HoverAction>) = actions.size > 1 || (actions.size == 1 && !actions.first().isOnNetwork)
+    private fun showRecipientNetwork(actions: List<HoverAction>): Boolean {
+        return actions.size > 1 || (actions.size == 1 && !actions.first().isOnNetwork)
+    }
 
     fun selectRecipientNetwork(action: HoverAction) {
         if (action == highlightedAction) return
@@ -85,15 +86,7 @@ class ActionSelect(context: Context, attrs: AttributeSet) : LinearLayout(context
     }
 
     private fun getWhoMeOptions(recipientInstId: Int): List<HoverAction> {
-        val options = ArrayList<HoverAction>()
-        if (allActions == null) return options
-
-        for (action in allActions!!) {
-            if (action.to_institution_id == recipientInstId && !options.contains(action))
-                options.add(action)
-        }
-
-        return options
+        return allActions?.filter { it.to_institution_id == recipientInstId } ?: emptyList()
     }
 
     private fun selectOnlyOption(option: HoverAction) {
diff --git a/app/src/main/java/com/hover/stax/actions/ActionSelectViewModel.kt b/app/src/main/java/com/hover/stax/actions/ActionSelectViewModel.kt
index a3eeae019..adbc87eed 100644
--- a/app/src/main/java/com/hover/stax/actions/ActionSelectViewModel.kt
+++ b/app/src/main/java/com/hover/stax/actions/ActionSelectViewModel.kt
@@ -9,7 +9,7 @@ import com.hover.stax.R
 import com.hover.stax.utils.Constants
 import java.util.LinkedHashMap
 
- class ActionSelectViewModel(private val application: Application) : ViewModel() {
+class ActionSelectViewModel(private val application: Application) : ViewModel() {
 
     val filteredActions = MediatorLiveData<List<HoverAction>>()
     val activeAction = MediatorLiveData<HoverAction>()
@@ -21,7 +21,7 @@ import java.util.LinkedHashMap
     }
 
     private fun setActiveActionIfOutOfDate(actions: List<HoverAction>) {
-        if (!actions.isNullOrEmpty() && (activeAction.value == null || !actions.contains(activeAction.value!!))) {
+        if (actions.isNotEmpty() && (activeAction.value == null || !actions.contains(activeAction.value!!))) {
             val action = actions.first()
             activeAction.postValue(action)
         }
@@ -40,6 +40,7 @@ import java.util.LinkedHashMap
         action.requiredParams.forEach {
             if (!isStandardVariable(it)) variableMap[it] = ""
         }
+
         nonStandardVariables.postValue(variableMap)
     }
 
@@ -48,9 +49,8 @@ import java.util.LinkedHashMap
     }
 
     fun updateNonStandardVariables(key: String, value: String) {
-        var map = nonStandardVariables.value
-        if (map == null) map = linkedMapOf()
+        val map = nonStandardVariables.value ?: linkedMapOf()
         map[key] = value
-        nonStandardVariables.postValue(map!!)
+        nonStandardVariables.postValue(map)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/hover/stax/balances/BalanceAdapter.kt b/app/src/main/java/com/hover/stax/balances/BalanceAdapter.kt
index db008a146..40231f8eb 100644
--- a/app/src/main/java/com/hover/stax/balances/BalanceAdapter.kt
+++ b/app/src/main/java/com/hover/stax/balances/BalanceAdapter.kt
@@ -13,7 +13,6 @@ import com.hover.stax.databinding.BalanceItemBinding
 import com.hover.stax.utils.DateUtils
 import com.hover.stax.utils.UIHelper
 import com.hover.stax.utils.Utils
-import timber.log.Timber
 
 
 class BalanceAdapter(val accounts: List<Account>, val balanceListener: BalanceListener?) : RecyclerView.Adapter<BalanceAdapter.BalancesViewHolder>() {
diff --git a/app/src/main/java/com/hover/stax/balances/BalancesFragment.kt b/app/src/main/java/com/hover/stax/balances/BalancesFragment.kt
index b1f9b3261..0696cc4e5 100644
--- a/app/src/main/java/com/hover/stax/balances/BalancesFragment.kt
+++ b/app/src/main/java/com/hover/stax/balances/BalancesFragment.kt
@@ -113,7 +113,7 @@ class BalancesFragment : Fragment() {
     }
 
     private fun updateServices(accounts: ArrayList<Account>) {
-        SHOW_ADD_ANOTHER_ACCOUNT = !accounts.isNullOrEmpty() && accounts.none { it.id == DUMMY } && accounts.size > 1
+        SHOW_ADD_ANOTHER_ACCOUNT = accounts.isNotEmpty() && accounts.none { it.id == DUMMY } && accounts.size > 1
         addDummyAccountsIfRequired(accounts)
 
         val balancesAdapter = BalanceAdapter(accounts, activity as MainActivity)
diff --git a/app/src/main/java/com/hover/stax/balances/BalancesViewModel.kt b/app/src/main/java/com/hover/stax/balances/BalancesViewModel.kt
index 5a2ec7227..47da9d807 100644
--- a/app/src/main/java/com/hover/stax/balances/BalancesViewModel.kt
+++ b/app/src/main/java/com/hover/stax/balances/BalancesViewModel.kt
@@ -11,8 +11,6 @@ import com.hover.stax.database.DatabaseRepo
 import com.hover.stax.utils.AnalyticsUtil
 import com.hover.stax.utils.Constants
 import com.hover.stax.utils.UIHelper
-import com.hover.stax.utils.Utils
-
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
@@ -74,11 +72,9 @@ class BalancesViewModel(val application: Application, val repo: DatabaseRepo) :
         runFlag.value = accountId
     }
 
-    fun setRunning(channel: Channel) {
-        viewModelScope.launch(Dispatchers.IO) {
-            val accounts = repo.getAccounts(channel.id)
-            runFlag.postValue(accounts.firstOrNull()?.id ?: channel.id)
-        }
+    fun setRunning(channel: Channel) = viewModelScope.launch(Dispatchers.IO) {
+        val accounts = repo.getAccounts(channel.id)
+        runFlag.postValue(accounts.firstOrNull()?.id ?: channel.id)
     }
 
     fun setAllRunning(c: Context) {
diff --git a/app/src/main/java/com/hover/stax/bonus/Bonus.kt b/app/src/main/java/com/hover/stax/bonus/Bonus.kt
new file mode 100644
index 000000000..adef25845
--- /dev/null
+++ b/app/src/main/java/com/hover/stax/bonus/Bonus.kt
@@ -0,0 +1,26 @@
+package com.hover.stax.bonus
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+
+@Entity(
+    tableName = "bonuses",
+    primaryKeys = ["user_channel", "purchase_channel"]
+)
+data class Bonus(
+
+    @ColumnInfo(name = "user_channel")
+    val userChannel: Int,
+
+    @ColumnInfo(name = "purchase_channel")
+    val purchaseChannel: Int,
+
+    @ColumnInfo(name = "bonus_percent")
+    val bonusPercent: Double,
+
+    val message: String
+) {
+    override fun toString(): String {
+        return message
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hover/stax/bonus/BonusDao.kt b/app/src/main/java/com/hover/stax/bonus/BonusDao.kt
new file mode 100644
index 000000000..f8c63891b
--- /dev/null
+++ b/app/src/main/java/com/hover/stax/bonus/BonusDao.kt
@@ -0,0 +1,44 @@
+package com.hover.stax.bonus
+
+import androidx.room.*
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface BonusDao {
+
+    @get:Query("SELECT * FROM bonuses")
+    val bonuses: Flow<List<Bonus>>
+
+    @Query("SELECT * FROM bonuses WHERE purchase_channel = :purchaseChannelId")
+    fun getBonusByPurchaseChannel(purchaseChannelId: Int): Bonus?
+
+    @Query("SELECT * FROM bonuses WHERE user_channel = :userChannelId")
+    fun getBonusByUserChannel(userChannelId: Int): Bonus?
+
+    @Query("SELECT * FROM bonuses WHERE purchase_channel IN (:purchaseChannelIds) AND user_channel in (:userChannelIds)")
+    fun getBonuses(purchaseChannelIds: List<Int>, userChannelIds: List<Int>): List<Bonus>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insert(bonus: Bonus)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertAll(bonuses: List<Bonus>)
+
+    @Update(onConflict = OnConflictStrategy.REPLACE)
+    fun update(bonus: Bonus)
+
+    @Update
+    fun updateAll(bonuses: List<Bonus>)
+
+    @Delete
+    fun delete(bonus: Bonus)
+
+    @Query("DELETE FROM bonuses")
+    fun deleteAll()
+
+    @Transaction
+    fun deleteAndSave(bonuses: List<Bonus>) {
+        deleteAll()
+        insertAll(bonuses)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hover/stax/bonus/BonusRepo.kt b/app/src/main/java/com/hover/stax/bonus/BonusRepo.kt
new file mode 100644
index 000000000..d2e01ff5e
--- /dev/null
+++ b/app/src/main/java/com/hover/stax/bonus/BonusRepo.kt
@@ -0,0 +1,24 @@
+package com.hover.stax.bonus
+
+import com.hover.stax.database.AppDatabase
+
+class BonusRepo(val db: AppDatabase) {
+
+    private val dao = db.bonusDao()
+
+    val bonuses = dao.bonuses
+
+    fun save(bonus: Bonus) = dao.insert(bonus)
+
+    fun save(bonuses: List<Bonus>) = dao.insertAll(bonuses)
+
+    fun getBonusByPurchaseChannel(purchaseChannelId: Int): Bonus? = dao.getBonusByPurchaseChannel(purchaseChannelId)
+
+    fun getBonusByUserChannel(userChannelId: Int): Bonus? = dao.getBonusByUserChannel(userChannelId)
+
+    fun delete(bonus: Bonus) = dao.delete(bonus)
+
+    fun delete() = dao.deleteAll()
+
+    fun updateBonuses(bonuses: List<Bonus>) = dao.deleteAndSave(bonuses)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hover/stax/bonus/BonusViewModel.kt b/app/src/main/java/com/hover/stax/bonus/BonusViewModel.kt
new file mode 100644
index 000000000..66232ef56
--- /dev/null
+++ b/app/src/main/java/com/hover/stax/bonus/BonusViewModel.kt
@@ -0,0 +1,87 @@
+package com.hover.stax.bonus
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.google.firebase.firestore.ktx.firestore
+import com.google.firebase.firestore.ktx.firestoreSettings
+import com.google.firebase.ktx.Firebase
+import com.hover.stax.channels.Channel
+import com.hover.stax.database.DatabaseRepo
+import com.hover.stax.utils.toHni
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+class BonusViewModel(val repo: BonusRepo, private val dbRepo: DatabaseRepo) : ViewModel() {
+
+    private val bonusList = MutableLiveData<List<Bonus>>(emptyList())
+    private val db = Firebase.firestore
+    private val settings = firestoreSettings { isPersistenceEnabled = true }
+
+    val bonuses: LiveData<List<Bonus>> get() = bonusList
+
+    init {
+        db.firestoreSettings = settings
+        fetchBonuses()
+    }
+
+    private fun fetchBonuses() {
+        db.collection("bonuses")
+            .get()
+            .addOnSuccessListener { snapshot ->
+                val results = snapshot.map { document ->
+                    Bonus(
+                        document.data["user_channel"].toString().toInt(), document.data["purchase_channel"].toString().toInt(),
+                        document.data["bonus_percent"].toString().toDouble(), document.data["message"].toString()
+                    )
+                }
+
+                saveBonuses(results)
+            }
+            .addOnFailureListener {
+                Timber.e("Error fetching bonuses: ${it.localizedMessage}")
+                bonusList.postValue(emptyList())
+            }
+    }
+
+    private fun saveBonuses(bonuses: List<Bonus>) = viewModelScope.launch(Dispatchers.IO) {
+        repo.updateBonuses(bonuses.filter { dbRepo.getChannel(it.purchaseChannel) != null })
+    }
+
+    fun getBonuses() = viewModelScope.launch(Dispatchers.IO) {
+        repo.bonuses.collect {
+            checkIfEligible(it)
+        }
+    }
+
+    fun getBonusByPurchaseChannel(channelId: Int): Bonus? = repo.getBonusByPurchaseChannel(channelId)
+
+    fun getBonusByUserChannel(channelId: Int): Bonus? = repo.getBonusByUserChannel(channelId)
+
+    private fun checkIfEligible(bonusItems: List<Bonus>) = viewModelScope.launch(Dispatchers.IO) {
+        val simHnis = dbRepo.presentSims.map { it.osReportedHni }
+        val bonusChannels = dbRepo.getChannelsByIds(bonusItems.map { it.purchaseChannel })
+
+        val showBonuses = hasValidSim(simHnis, bonusChannels)
+        bonusList.postValue(if (showBonuses) bonusItems else emptyList())
+    }
+
+    /**
+     * Extract the hnis from the bonus channels and compare with current sim hnis.
+     * Return true if user has a valid sim
+     */
+    private fun hasValidSim(simHnis: List<String>, bonusChannels: List<Channel>) : Boolean {
+        val hniList = mutableSetOf<String>()
+        bonusChannels.forEach { channel ->
+            channel.hniList.split(",").forEach {
+                if (simHnis.contains(it.toHni()))
+                    hniList.add(it.toHni())
+            }
+        }
+
+        return hniList.isNotEmpty()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hover/stax/bounties/Bounty.kt b/app/src/main/java/com/hover/stax/bounties/Bounty.kt
index 430662dab..f74e16329 100644
--- a/app/src/main/java/com/hover/stax/bounties/Bounty.kt
+++ b/app/src/main/java/com/hover/stax/bounties/Bounty.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import com.hover.sdk.actions.HoverAction
 import com.hover.sdk.transactions.Transaction
 import com.hover.stax.R
+import com.hover.stax.channels.Channel
 import com.hover.stax.transactions.StaxTransaction
 import com.yariksoffice.lingver.Lingver
 import java.util.*
@@ -46,4 +47,6 @@ class Bounty(val action: HoverAction, val transactions: List<StaxTransaction>) {
     private fun getCountryName(country_alpha2: String): String {
         return Locale(Lingver.getInstance().getLanguage(), country_alpha2).displayCountry
     }
-}
\ No newline at end of file
+}
+
+data class ChannelBounties (val channel: Channel, val bounties: List<Bounty>)
\ No newline at end of file
diff --git a/app/src/main/java/com/hover/stax/bounties/BountyAdapter.kt b/app/src/main/java/com/hover/stax/bounties/BountyAdapter.kt
new file mode 100644
index 000000000..2f8c7983c
--- /dev/null
+++ b/app/src/main/java/com/hover/stax/bounties/BountyAdapter.kt
@@ -0,0 +1,49 @@
+package com.hover.stax.bounties
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.hover.stax.databinding.BountyCardChannelBinding
+
+class BountyAdapter(private val selectListener: BountyListItem.SelectListener) : ListAdapter<ChannelBounties, BountyAdapter.BountyViewHolder>(diffUtil) {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BountyViewHolder {
+        return BountyViewHolder(BountyCardChannelBinding.inflate(LayoutInflater.from(parent.context), parent, false))
+    }
+
+    override fun onBindViewHolder(holder: BountyViewHolder, position: Int) {
+        getItem(holder.adapterPosition)?.let {
+            holder.bindItems(it, selectListener)
+        }
+    }
+
+    class BountyViewHolder(var binding: BountyCardChannelBinding) : RecyclerView.ViewHolder(binding.root) {
+
+        fun bindItems(channelBounties: ChannelBounties, selectListener: BountyListItem.SelectListener) {
+            binding.bountyChannelCard.setTitle(channelBounties.channel.ussdName)
+            binding.bountyList.removeAllViews()
+
+            for (b in channelBounties.bounties) {
+                val bountyLi = BountyListItem(binding.bountyChannelCard.context, null)
+                bountyLi.setBounty(b, selectListener)
+                binding.bountyList.addView(bountyLi)
+            }
+        }
+
+    }
+
+    companion object {
+        private val diffUtil = object : DiffUtil.ItemCallback<ChannelBounties>() {
+            override fun areItemsTheSame(oldItem: ChannelBounties, newItem: ChannelBounties): Boolean {
+                return oldItem.channel.id == newItem.channel.id
+            }
+
+            override fun areContentsTheSame(oldItem: ChannelBounties, newItem: ChannelBounties): Boolean {
+                return oldItem.channel == newItem.channel
+            }
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/hover/stax/bounties/BountyChannelsAdapter.kt b/app/src/main/java/com/hover/stax/bounties/BountyChannelsAdapter.kt
deleted file mode 100644
index 54baf1a09..000000000
--- a/app/src/main/java/com/hover/stax/bounties/BountyChannelsAdapter.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.hover.stax.bounties
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.hover.stax.bounties.BountyChannelsAdapter.CardedBountyListViewHolder
-import com.hover.stax.channels.Channel
-import com.hover.stax.databinding.BountyCardChannelBinding
-
-internal class BountyChannelsAdapter(private var channelList: List<Channel>?, private val allBountiesList: List<Bounty>, private val selectListener: BountyListItem.SelectListener) : RecyclerView.Adapter<CardedBountyListViewHolder>() {
-
-    init {
-        channelList = channelList?.asSequence()?.filter { filterBounties(it.id).any { b -> b.action.bounty_is_open || b.transactionCount != 0 } }?.toList()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CardedBountyListViewHolder {
-        val binding = BountyCardChannelBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return CardedBountyListViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: CardedBountyListViewHolder, position: Int) {
-        val c = channelList!![position]
-        holder.binding.bountyChannelCard.setTitle(c.ussdName)
-        val channelBounties = filterBounties(c.id)
-        for (b in channelBounties) {
-            if (b.action.bounty_is_open || b.transactionCount != 0) {
-                val bountyLi = BountyListItem(holder.binding.bountyChannelCard.context, null)
-                bountyLi.setBounty(b, selectListener)
-                holder.binding.bountyList.addView(bountyLi)
-            }
-        }
-    }
-
-    private fun filterBounties(channelId: Int): List<Bounty> {
-        val matches: MutableList<Bounty> = ArrayList()
-        for (b in allBountiesList) {
-            if (b.action.channel_id == channelId) {
-                matches.add(b)
-            }
-        }
-        return matches
-    }
-
-    override fun getItemCount(): Int {
-        return channelList?.size ?: 0
-    }
-
-    internal class CardedBountyListViewHolder(var binding: BountyCardChannelBinding) : RecyclerView.ViewHolder(binding.root)
-
-    override fun getItemId(position: Int): Long {
-        return position.toLong()
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        return position
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/hover/stax/bounties/BountyListFragment.kt b/app/src/main/java/com/hover/stax/bounties/BountyListFragment.kt
index c46c0a191..ced5a1065 100644
--- a/app/src/main/java/com/hover/stax/bounties/BountyListFragment.kt
+++ b/app/src/main/java/com/hover/stax/bounties/BountyListFragment.kt
@@ -6,12 +6,14 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.ExistingWorkPolicy
 import androidx.work.WorkManager
 import com.hover.sdk.actions.HoverAction
 import com.hover.sdk.api.Hover
+import com.hover.sdk.sims.SimInfo
 import com.hover.stax.R
 import com.hover.stax.channels.Channel
 import com.hover.stax.channels.UpdateChannelsWorker
@@ -27,6 +29,7 @@ import com.hover.stax.utils.Utils
 import com.hover.stax.utils.network.NetworkMonitor
 import com.hover.stax.views.AbstractStatefulInput
 import com.hover.stax.views.StaxDialog
+import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import timber.log.Timber
 
@@ -41,6 +44,8 @@ class BountyListFragment : Fragment(), BountyListItem.SelectListener, CountryAda
 
     private var dialog: StaxDialog? = null
 
+    private val bountyAdapter = BountyAdapter(this)
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         AnalyticsUtil.logAnalyticsEvent(getString(R.string.visit_screen, getString(R.string.visit_bounty_list)), requireActivity())
 
@@ -53,8 +58,10 @@ class BountyListFragment : Fragment(), BountyListItem.SelectListener, CountryAda
         networkMonitor = NetworkMonitor(requireActivity())
 
         initRecyclerView()
+
         startObservers()
 
+        binding.bountiesRecyclerView.adapter = bountyAdapter
         binding.bountyCountryDropdown.isEnabled = false
         binding.countryFilter.apply {
             showProgressIndicator()
@@ -109,10 +116,10 @@ class BountyListFragment : Fragment(), BountyListItem.SelectListener, CountryAda
         dialog!!.showIt()
     }
 
-    private fun initCountryDropdown(channels: List<Channel>) {
-        binding.bountyCountryDropdown.setListener(this)
-        binding.bountyCountryDropdown.updateChoices(channels, bountyViewModel.currentCountryFilter.value)
-        binding.bountyCountryDropdown.isEnabled = true
+    private fun initCountryDropdown(channels: List<Channel>) = binding.bountyCountryDropdown.apply {
+        setListener(this@BountyListFragment)
+        updateChoices(channels, bountyViewModel.currentCountryFilter.value)
+        isEnabled = true
     }
 
     private fun initRecyclerView() {
@@ -120,21 +127,27 @@ class BountyListFragment : Fragment(), BountyListItem.SelectListener, CountryAda
     }
 
     private fun startObservers() = with(bountyViewModel) {
-        val actionsObserver = object: Observer<List<HoverAction>> {
+        val actionsObserver = object : Observer<List<HoverAction>> {
             override fun onChanged(t: List<HoverAction>?) {
                 Timber.v("Actions update: ${t?.size}")
             }
-
         }
-        val txnObserver = object: Observer<List<StaxTransaction>> {
+
+        val txnObserver = object : Observer<List<StaxTransaction>> {
             override fun onChanged(t: List<StaxTransaction>?) {
                 Timber.v("Transactions update ${t?.size}")
             }
         }
 
+        val simsObserver = object: Observer<List<SimInfo>> {
+            override fun onChanged(t: List<SimInfo>?) {
+                Timber.v("Sims update ${t?.size}")
+            }
+        }
+
         actions.observe(viewLifecycleOwner, actionsObserver)
         transactions.observe(viewLifecycleOwner, txnObserver)
-        sims.observe(viewLifecycleOwner) { Timber.v("Sims update ${it.size}") }
+        sims.observe(viewLifecycleOwner, simsObserver)
         bounties.observe(viewLifecycleOwner) { updateChannelList(channels.value, it) }
         channels.observe(viewLifecycleOwner) {
             initCountryDropdown(it)
@@ -148,16 +161,30 @@ class BountyListFragment : Fragment(), BountyListItem.SelectListener, CountryAda
         if (!channels.isNullOrEmpty() && !bounties.isNullOrEmpty() &&
             bountyViewModel.country == CountryAdapter.CODE_ALL_COUNTRIES || channels?.firstOrNull()?.countryAlpha2 == bountyViewModel.country
         ) {
+            hideLoadingState()
+
             binding.msgNoBounties.visibility = View.GONE
+            binding.bountiesRecyclerView.visibility = View.VISIBLE
 
-            val adapter = BountyChannelsAdapter(channels, bounties!!, this)
-            binding.bountiesRecyclerView.adapter = adapter
-            hideLoadingState()
+            showBounties(channels, bounties!!)
         } else {
             binding.msgNoBounties.visibility = View.VISIBLE
+            binding.bountiesRecyclerView.visibility = View.GONE
         }
     }
 
+    private fun showBounties(channels: List<Channel>, bounties: List<Bounty>) = lifecycleScope.launch {
+        val openBounties = bounties.filter { it.action.bounty_is_open || it.transactionCount != 0 }
+
+        val channelBounties = channels.filter { c ->
+            openBounties.any { it.action.channel_id == c.id }
+        }.map { channel ->
+            ChannelBounties(channel, openBounties.filter { it.action.channel_id == channel.id })
+        }
+
+        bountyAdapter.submitList(channelBounties)
+    }
+
     override fun viewTransactionDetail(uuid: String?) {
         uuid?.let { NavUtil.showTransactionDetailsFragment(findNavController(), uuid) }
     }
diff --git a/app/src/main/java/com/hover/stax/bounties/BountyListItem.java b/app/src/main/java/com/hover/stax/bounties/BountyListItem.java
deleted file mode 100644
index f505f6382..000000000
--- a/app/src/main/java/com/hover/stax/bounties/BountyListItem.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.hover.stax.bounties;
-
-import android.content.Context;
-import android.text.Html;
-import android.text.Spannable;
-import android.text.Spanned;
-import android.text.method.LinkMovementMethod;
-import android.text.style.StrikethroughSpan;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.text.HtmlCompat;
-
-import com.hover.stax.R;
-import com.hover.stax.databinding.BountyListItemBinding;
-
-class BountyListItem extends LinearLayout {
-    private final BountyListItemBinding binding;
-    private Bounty bounty;
-    private SelectListener selectListener;
-
-    BountyListItem(@NonNull Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-        binding = BountyListItemBinding.inflate(LayoutInflater.from(context), this, true);
-    }
-
-    public void setBounty(Bounty b, SelectListener listener) {
-        bounty = b;
-        setContent();
-        chooseState();
-        selectListener = listener;
-    }
-
-    private void setContent() {
-        binding.liDescription.setText(bounty.generateDescription(getContext()));
-        binding.liAmount.setText(getContext().getString(R.string.bounty_amount_with_currency, bounty.getAction().bounty_amount));
-    }
-
-    private void chooseState() {
-        if (bounty.hasASuccessfulTransaction()) {
-            setState(R.color.muted_green, R.string.done, R.drawable.ic_check, false, null);
-        } else if (bounty.isLastTransactionFailed() && !bounty.getAction().bounty_is_open) {
-            setState(R.color.stax_bounty_red_bg, R.string.bounty_transaction_failed, R.drawable.ic_info_red, false, navTransactionDetail());
-        } else if (bounty.isLastTransactionFailed() && bounty.getAction().bounty_is_open) {
-            setState(R.color.stax_bounty_red_bg, R.string.bounty_transaction_failed_try_again, R.drawable.ic_info_red, true, showBountyDetail());
-        } else if (!bounty.getAction().bounty_is_open) { // This bounty is closed and done by another user
-            setState(R.color.lighter_grey, 0, 0, false, null);
-        } else if (bounty.getTransactionCount() > 0) { // Bounty is open and with a transaction by current user
-            setState(R.color.pending_brown, R.string.bounty_pending_short_desc, R.drawable.ic_warning, true, navTransactionDetail());
-        } else
-            setState(R.color.cardViewColor, 0, 0, true, showBountyDetail());
-    }
-
-    private View.OnClickListener navTransactionDetail() {
-        return (view) -> selectListener.viewTransactionDetail(bounty.getTransactions().get(bounty.lastTransactionIndex()).uuid);
-    }
-
-    private View.OnClickListener showBountyDetail() {
-        return (view) -> selectListener.viewBountyDetail(bounty);
-    }
-
-    private void setState(int color, int noticeString, int noticeIcon, boolean isOpen, View.OnClickListener listener) {
-        setBackgroundColor(getContext().getResources().getColor(color));
-        if (noticeString != 0) {
-            binding.liStatus.setText(HtmlCompat.fromHtml(getContext().getString(noticeString), HtmlCompat.FROM_HTML_MODE_LEGACY));
-            binding.liStatus.setMovementMethod(LinkMovementMethod.getInstance());
-        }
-        binding.liStatus.setCompoundDrawablesWithIntrinsicBounds(noticeIcon, 0, 0, 0);
-        binding.liStatus.setVisibility(noticeString != 0 ? View.VISIBLE : View.GONE);
-
-        if (!isOpen) strikeThrough(binding.liAmount);
-        if (!isOpen) strikeThrough(binding.liDescription);
-        setOnClickListener(listener);
-    }
-
-    private void strikeThrough(TextView textView) {
-        textView.setText(textView.getText(), TextView.BufferType.SPANNABLE);
-        Spannable spannable = (Spannable) textView.getText();
-        spannable.setSpan(new StrikethroughSpan(), 0, textView.getText().length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-    }
-
-    public interface SelectListener {
-        void viewTransactionDetail(String uuid);
-
-        void viewBountyDetail(Bounty b);
-    }
-}
diff --git a/app/src/main/java/com/hover/stax/bounties/BountyListItem.kt b/app/src/main/java/com/hover/stax/bounties/BountyListItem.kt
new file mode 100644
index 000000000..5c30919fb
--- /dev/null
+++ b/app/src/main/java/com/hover/stax/bounties/BountyListItem.kt
@@ -0,0 +1,97 @@
+package com.hover.stax.bounties
+
+import android.content.Context
+import android.text.Spannable
+import android.text.Spanned
+import android.text.method.LinkMovementMethod
+import android.text.style.StrikethroughSpan
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View.OnClickListener
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.text.HtmlCompat
+import com.hover.stax.R
+import com.hover.stax.databinding.BountyListItemBinding
+
+class BountyListItem(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
+
+    private val binding: BountyListItemBinding
+    private var bounty: Bounty? = null
+    private var selectListener: SelectListener? = null
+
+    init {
+        binding = BountyListItemBinding.inflate(LayoutInflater.from(context), this, true)
+    }
+
+    fun setBounty(b: Bounty, listener: SelectListener?) {
+        bounty = b
+        setContent()
+        chooseState()
+        selectListener = listener
+    }
+
+    private fun setContent() {
+        binding.liDescription.text = bounty!!.generateDescription(context)
+        binding.liAmount.text = context.getString(R.string.bounty_amount_with_currency, bounty!!.action.bounty_amount)
+    }
+
+    private fun chooseState() {
+        when {
+            bounty!!.hasASuccessfulTransaction() -> {
+                setState(R.color.muted_green, R.string.done, R.drawable.ic_check, false, null)
+            }
+            bounty!!.isLastTransactionFailed() && !bounty!!.action.bounty_is_open -> {
+                setState(R.color.stax_bounty_red_bg, R.string.bounty_transaction_failed, R.drawable.ic_error, false, navTransactionDetail())
+            }
+            bounty!!.isLastTransactionFailed() && bounty!!.action.bounty_is_open -> {
+                setState(R.color.stax_bounty_red_bg, R.string.bounty_transaction_failed_try_again, R.drawable.ic_error, true, showBountyDetail())
+            }
+            !bounty!!.action.bounty_is_open -> { // This bounty is closed and done by another user
+                setState(R.color.lighter_grey, 0, 0, false, null)
+            }
+            bounty!!.transactionCount > 0 -> { // Bounty is open and with a transaction by current user
+                setState(R.color.pending_brown, R.string.bounty_pending_short_desc, R.drawable.ic_warning, true, navTransactionDetail())
+            }
+            else -> setState(R.color.cardViewColor, 0, 0, true, showBountyDetail())
+        }
+    }
+
+    private fun navTransactionDetail(): OnClickListener {
+        return OnClickListener { selectListener?.viewTransactionDetail(bounty!!.transactions[bounty!!.lastTransactionIndex()].uuid) }
+    }
+
+    private fun showBountyDetail(): OnClickListener {
+        return OnClickListener { selectListener?.viewBountyDetail(bounty!!) }
+    }
+
+    private fun setState(color: Int, noticeString: Int, noticeIcon: Int, isOpen: Boolean, listener: OnClickListener?) {
+        setBackgroundColor(ContextCompat.getColor(context, color))
+
+        if (noticeString != 0) {
+            binding.liStatus.text = HtmlCompat.fromHtml(context.getString(noticeString), HtmlCompat.FROM_HTML_MODE_LEGACY)
+            binding.liStatus.movementMethod = LinkMovementMethod.getInstance()
+        }
+
+        binding.liStatus.setCompoundDrawablesWithIntrinsicBounds(noticeIcon, 0, 0, 0)
+        binding.liStatus.visibility = if (noticeString != 0) VISIBLE else GONE
+
+        if (!isOpen) strikeThrough(binding.liAmount)
+        if (!isOpen) strikeThrough(binding.liDescription)
+        setOnClickListener(listener)
+    }
+
+    private fun strikeThrough(textView: TextView) {
+        textView.setText(textView.text, TextView.BufferType.SPANNABLE)
+        val spannable = textView.text as Spannable
+        spannable.setSpan(StrikethroughSpan(), 0, textView.text.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+    }
+
+    interface SelectListener {
+        fun viewTransactionDetail(uuid: String?)
+        fun viewBountyDetail(b: Bounty)
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hover/stax/channels/AddChannelsFragment.kt b/app/src/main/java/com/hover/stax/channels/AddChannelsFragment.kt
index dbdd3424e..b56d0a469 100644
--- a/app/src/main/java/com/hover/stax/channels/AddChannelsFragment.kt
+++ b/app/src/main/java/com/hover/stax/channels/AddChannelsFragment.kt
@@ -11,6 +11,8 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.Observer
 import androidx.recyclerview.selection.SelectionPredicates
 import androidx.recyclerview.selection.SelectionTracker
 import androidx.recyclerview.selection.StorageStrategy
@@ -18,6 +20,7 @@ import androidx.work.ExistingWorkPolicy
 import androidx.work.WorkManager
 import com.hover.stax.R
 import com.hover.stax.balances.BalancesViewModel
+import com.hover.stax.bonus.BonusViewModel
 import com.hover.stax.databinding.FragmentAddChannelsBinding
 import com.hover.stax.utils.AnalyticsUtil
 import com.hover.stax.utils.Constants
@@ -26,6 +29,10 @@ import com.hover.stax.utils.Utils
 import com.hover.stax.views.RequestServiceDialog
 
 import com.hover.stax.views.StaxDialog
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import okhttp3.internal.filterList
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import timber.log.Timber
@@ -35,11 +42,12 @@ class AddChannelsFragment : Fragment(), ChannelsAdapter.SelectListener {
 
     private val channelsViewModel: ChannelsViewModel by viewModel()
     private val balancesViewModel: BalancesViewModel by sharedViewModel()
+    private val bonusViewModel: BonusViewModel by sharedViewModel()
 
     private var _binding: FragmentAddChannelsBinding? = null
     private val binding get() = _binding!!
 
-    private val selectAdapter: ChannelsAdapter = ChannelsAdapter(ArrayList(0), this)
+    private val selectAdapter: ChannelsAdapter = ChannelsAdapter(this)
     private var tracker: SelectionTracker<Long>? = null
 
     private var dialog: StaxDialog? = null
@@ -64,18 +72,18 @@ class AddChannelsFragment : Fragment(), ChannelsAdapter.SelectListener {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding.channelsListCard.showProgressIndicator()
+        binding.channelsListCard.apply{
+            showProgressIndicator()
+            setTitle(getString(R.string.add_accounts_to_stax))
+        }
 
-        binding.channelsListCard.setTitle(getString(R.string.add_accounts_to_stax))
         binding.selectedList.apply {
             layoutManager = UIHelper.setMainLinearManagers(requireContext())
-            setHasFixedSize(true)
             isNestedScrollingEnabled = false
         }
 
         binding.channelsList.apply {
             layoutManager = UIHelper.setMainLinearManagers(requireContext())
-            setHasFixedSize(true)
             adapter = selectAdapter
             isNestedScrollingEnabled = false
         }
@@ -84,12 +92,18 @@ class AddChannelsFragment : Fragment(), ChannelsAdapter.SelectListener {
         setUpMultiselect()
         setSearchInputWatcher()
 
-
         channelsViewModel.selectedChannels.observe(viewLifecycleOwner) { onSelectedLoaded(it) }
         channelsViewModel.simChannels.observe(viewLifecycleOwner) { if(it.isEmpty())  setError(R.string.channels_error_nosim) else Timber.i("loaded") }
         channelsViewModel.filteredChannels.observe(viewLifecycleOwner){ loadFilteredChannels(it) }
-        channelsViewModel.allChannels.observe(viewLifecycleOwner) { Timber.i("Loaded all channels") }
+        channelsViewModel.allChannels.observe(viewLifecycleOwner, allChannelsObserver)
+    }
+
+    private val allChannelsObserver = object: Observer<List<Channel>> {
+        override fun onChanged(t: List<Channel>?) {
+            Timber.e("Loaded all channels ${t?.size}")
+        }
     }
+
     private fun setupEmptyState() {
         binding.emptyState.root.visibility = GONE
         binding.emptyState.informUs.setOnClickListener {
@@ -127,8 +141,11 @@ class AddChannelsFragment : Fragment(), ChannelsAdapter.SelectListener {
 
         showSelected(channels.isNotEmpty())
 
-        if (channels.isNotEmpty())
-            binding.selectedList.adapter = ChannelsAdapter(channels, this)
+        if (channels.isNotEmpty()) {
+            val adapter = ChannelsAdapter(this)
+            binding.selectedList.adapter = adapter
+            adapter.submitList(channels)
+        }
     }
 
     private fun showSelected(visible: Boolean) {
@@ -140,10 +157,22 @@ class AddChannelsFragment : Fragment(), ChannelsAdapter.SelectListener {
         binding.channelsListCard.hideProgressIndicator()
 
         if (channels.isNotEmpty()) {
-            updateAdapter(Channel.sort(channels, false))
-            binding.emptyState.root.visibility = GONE
-            binding.channelsList.visibility = VISIBLE
-            binding.errorText.visibility = GONE
+            lifecycleScope.launch {
+                val bonusChannelIds = bonusViewModel.bonuses.value?.map { it.purchaseChannel }
+
+                val list = if(!bonusChannelIds.isNullOrEmpty())
+                    channels.filterNot { bonusChannelIds.contains(it.id) }
+                else
+                    channels
+
+                updateAdapter(list.filterNot { it.selected })
+
+                withContext(Dispatchers.Main) {
+                    binding.emptyState.root.visibility = GONE
+                    binding.channelsList.visibility = VISIBLE
+                    binding.errorText.visibility = GONE
+                }
+            }
         }
         else if(channelsViewModel.isInSearchMode()) showEmptyState()
         else setError(R.string.channels_error_nodata)
@@ -161,9 +190,8 @@ class AddChannelsFragment : Fragment(), ChannelsAdapter.SelectListener {
         binding.errorText.visibility = GONE
     }
 
-
     private fun updateAdapter(channels: List<Channel>) {
-        selectAdapter.updateList(channels)
+        selectAdapter.submitList(channels)
     }
 
     private fun setError(message: Int) {
@@ -179,10 +207,8 @@ class AddChannelsFragment : Fragment(), ChannelsAdapter.SelectListener {
         else {
             binding.errorText.visibility = GONE
 
-            val selectedChannels = mutableListOf<Channel>()
-            tracker.selection.forEach { selection ->
-                selectedChannels.addAll(selectAdapter.channelList.filter { it.id.toLong() == selection })
-            }
+            val ids = tracker.selection
+            val selectedChannels = selectAdapter.currentList.filter { ids.contains(it.id.toLong()) }
 
             channelsViewModel.setChannelsSelected(selectedChannels)
             channelsViewModel.createAccounts(selectedChannels)
@@ -205,8 +231,10 @@ class AddChannelsFragment : Fragment(), ChannelsAdapter.SelectListener {
     }
 
     private fun runActions(channels: List<Channel>, checkBalance: Boolean) {
-        if (activity != null && isAdded)
+        if (activity != null && isAdded) {
             requireActivity().onBackPressed()
+            return
+        }
 
         if (checkBalance)
             balancesViewModel.actions.observe(viewLifecycleOwner) {
@@ -225,15 +253,12 @@ class AddChannelsFragment : Fragment(), ChannelsAdapter.SelectListener {
     //channels will be loaded only once after install then deferred to weekly.
     private fun refreshChannelsIfRequired() {
         if (!Utils.getBoolean(Constants.CHANNELS_REFRESHED, requireActivity())) {
-            Timber.i("Reloading channels")
             val wm = WorkManager.getInstance(requireContext())
             wm.beginUniqueWork(UpdateChannelsWorker.CHANNELS_WORK_ID, ExistingWorkPolicy.KEEP, UpdateChannelsWorker.makeWork()).enqueue()
 
             Utils.saveBoolean(Constants.CHANNELS_REFRESHED, true, requireActivity())
             return
         }
-
-        Timber.i("Channels already reloaded")
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/com/hover/stax/channels/Channel.java b/app/src/main/java/com/hover/stax/channels/Channel.java
index ffffe7342..c175d406d 100644
--- a/app/src/main/java/com/hover/stax/channels/Channel.java
+++ b/app/src/main/java/com/hover/stax/channels/Channel.java
@@ -3,19 +3,14 @@
 import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
-import androidx.room.Ignore;
 import androidx.room.PrimaryKey;
 
-import com.hover.stax.utils.DateUtils;
-
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 
 import timber.log.Timber;
 
diff --git a/app/src/main/java/com/hover/stax/channels/ChannelKeyProvider.kt b/app/src/main/java/com/hover/stax/channels/ChannelKeyProvider.kt
index c97dd507e..d67daf1ca 100644
--- a/app/src/main/java/com/hover/stax/channels/ChannelKeyProvider.kt
+++ b/app/src/main/java/com/hover/stax/channels/ChannelKeyProvider.kt
@@ -2,9 +2,9 @@ package com.hover.stax.channels
 
 import androidx.recyclerview.selection.ItemKeyProvider
 
-class ChannelKeyProvider(private val adapter: ChannelsAdapter) : ItemKeyProvider<Long>(SCOPE_CACHED) {
+class ChannelKeyProvider(private val adapter: ChannelsAdapter) : ItemKeyProvider<Long>(SCOPE_MAPPED) {
 
-    override fun getKey(position: Int): Long = adapter.channelList[position].id.toLong()
+    override fun getKey(position: Int): Long = adapter.currentList[position].id.toLong()
 
-    override fun getPosition(key: Long): Int = adapter.channelList.indexOfFirst { it.id.toLong() == key }
+    override fun getPosition(key: Long): Int = adapter.currentList.indexOfFirst { it.id.toLong() == key }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/hover/stax/channels/ChannelsAdapter.kt b/app/src/main/java/com/hover/stax/channels/ChannelsAdapter.kt
index 27b50b111..0c16ac8b2 100644
--- a/app/src/main/java/com/hover/stax/channels/ChannelsAdapter.kt
+++ b/app/src/main/java/com/hover/stax/channels/ChannelsAdapter.kt
@@ -3,10 +3,11 @@ package com.hover.stax.channels
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.selection.SelectionTracker
-import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
 import com.hover.stax.databinding.StaxSpinnerItemWithLogoBinding
 
-class ChannelsAdapter(var channelList: List<Channel>, var selectListener: SelectListener?) : RecyclerView.Adapter<ChannelsViewHolder>() {
+class ChannelsAdapter(var selectListener: SelectListener?) : ListAdapter<Channel, ChannelsViewHolder>(diffUtil) {
 
     private var selectionTracker: SelectionTracker<Long>? = null
 
@@ -20,20 +21,13 @@ class ChannelsAdapter(var channelList: List<Channel>, var selectListener: Select
     }
 
     override fun onBindViewHolder(holder: ChannelsViewHolder, position: Int) {
-        val channel = channelList[holder.adapterPosition]
+        val channel = getItem(holder.adapterPosition)
         holder.bind(channel, selectionTracker != null, selectionTracker?.isSelected(channel.id.toLong()))
         holder.itemView.setOnClickListener { selectListener?.clickedChannel(channel) }
     }
 
-    override fun getItemCount(): Int = channelList.size
-
     override fun getItemId(position: Int): Long {
-        return channelList[position].id.toLong()
-    }
-
-    fun updateList(list: List<Channel>) {
-        channelList = list
-        notifyDataSetChanged()
+        return getItem(position).id.toLong()
     }
 
     fun setTracker(tracker: SelectionTracker<Long>) {
@@ -43,4 +37,17 @@ class ChannelsAdapter(var channelList: List<Channel>, var selectListener: Select
     interface SelectListener {
         fun clickedChannel(channel: Channel)
     }
+
+    companion object {
+        val diffUtil = object : DiffUtil.ItemCallback<Channel>() {
+            override fun areItemsTheSame(oldItem: Channel, newItem: Channel): Boolean {
+                return oldItem.id == newItem.id
+            }
+
+            override fun areContentsTheSame(oldItem: Channel, newItem: Channel): Boolean {
+                return oldItem.name == newItem.name
+            }
+
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/hover/stax/channels/ChannelsViewHolder.kt b/app/src/main/java/com/hover/stax/channels/ChannelsViewHolder.kt
index e37d401ad..acce5c4cd 100644
--- a/app/src/main/java/com/hover/stax/channels/ChannelsViewHolder.kt
+++ b/app/src/main/java/com/hover/stax/channels/ChannelsViewHolder.kt
@@ -9,31 +9,25 @@ import androidx.recyclerview.selection.ItemDetailsLookup
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.checkbox.MaterialCheckBox
 import com.hover.stax.databinding.StaxSpinnerItemWithLogoBinding
-import com.hover.stax.utils.UIHelper
+import com.hover.stax.utils.UIHelper.loadImage
 
 class ChannelsViewHolder(val binding: StaxSpinnerItemWithLogoBinding) : RecyclerView.ViewHolder(binding.root) {
 
-    var id: TextView? = null
-    private var channelText: AppCompatTextView? = null
-
-    private var logo: ImageView? = null
-    private var checkBox: MaterialCheckBox? = null
+    val id: TextView = binding.serviceItemId
+    private val channelText: AppCompatTextView = binding.serviceItemNameId
+    private val logo: ImageView = binding.serviceItemImageId
+    private val checkBox: MaterialCheckBox = binding.serviceItemCheckbox
 
     fun bind(channel: Channel, isMultiselect: Boolean = false, isSelected: Boolean? = false) {
-        logo = binding.serviceItemImageId
-        channelText = binding.serviceItemNameId
-        id = binding.serviceItemId
-        checkBox = binding.serviceItemCheckbox
-
         if (isMultiselect) {
-            checkBox!!.visibility = View.VISIBLE
-            checkBox!!.isChecked = isSelected != null && isSelected
-        } else checkBox!!.visibility = View.GONE
+            checkBox.visibility = View.VISIBLE
+            checkBox.isChecked = isSelected != null && isSelected
+        } else checkBox.visibility = View.GONE
 
-        id!!.text = channel.id.toString()
-        channelText!!.text = channel.toString()
+        id.text = channel.id.toString()
+        channelText.text = channel.toString()
 
-        UIHelper.loadImage(binding.root.context, channel.logoUrl, logo!!)
+        logo.loadImage(binding.root.context, channel.logoUrl)
     }
 
     fun getItemDetails(): ItemDetailsLookup.ItemDetails<Long> = object : ItemDetailsLookup.ItemDetails<Long>() {
diff --git a/app/src/main/java/com/hover/stax/channels/ChannelsViewModel.kt b/app/src/main/java/com/hover/stax/channels/ChannelsViewModel.kt
index f7a71e1c3..770523c17 100644
--- a/app/src/main/java/com/hover/stax/channels/ChannelsViewModel.kt
+++ b/app/src/main/java/com/hover/stax/channels/ChannelsViewModel.kt
@@ -15,9 +15,9 @@ import com.hover.sdk.sims.SimInfo
 import com.hover.stax.R
 import com.hover.stax.accounts.Account
 import com.hover.stax.accounts.AccountDropdown
+import com.hover.stax.accounts.ChannelWithAccounts
 import com.hover.stax.database.DatabaseRepo
 import com.hover.stax.notifications.PushNotificationTopicsInterface
-import com.hover.stax.requests.Request
 import com.hover.stax.schedules.Schedule
 import com.hover.stax.utils.*
 import kotlinx.coroutines.Dispatchers
@@ -86,10 +86,12 @@ class ChannelsViewModel(val application: Application, val repo: DatabaseRepo) :
     }
 
     private fun filterChannels(channels: List<Channel>) {
-        if(!channels.isNullOrEmpty()) {
+        if (channels.isNotEmpty()) {
             viewModelScope.launch(Dispatchers.IO) {
-                val filteredList = channels.filter { it.toString().toFilteringStandard()
-                    .contains(filterQuery.value!!.toFilteringStandard()) }
+                val filteredList = channels.filter {
+                    it.toString().toFilteringStandard()
+                        .contains(filterQuery.value!!.toFilteringStandard())
+                }
                 filteredChannels.postValue(filteredList)
             }
         }
@@ -97,10 +99,11 @@ class ChannelsViewModel(val application: Application, val repo: DatabaseRepo) :
 
     fun runChannelFilter(value: String) {
         filterQuery.value = value
-        val listToFilter : List<Channel>? = if(!simChannels.value.isNullOrEmpty()) simChannels.value else allChannels.value
+        val listToFilter: List<Channel>? = if (!simChannels.value.isNullOrEmpty()) simChannels.value else allChannels.value
         filterChannels(listToFilter!!)
     }
-    fun isInSearchMode() : Boolean {
+
+    fun isInSearchMode(): Boolean {
         return !filterQuery.value!!.isAbsolutelyEmpty()
     }
 
@@ -193,7 +196,7 @@ class ChannelsViewModel(val application: Application, val repo: DatabaseRepo) :
     }
 
     private fun setActiveChannelIfNull(channels: List<Channel>) {
-        if (!channels.isNullOrEmpty() && activeChannel.value == null)
+        if (channels.isNotEmpty() && activeChannel.value == null)
             activeChannel.value = channels.firstOrNull { it.defaultAccount }
     }
 
@@ -202,20 +205,44 @@ class ChannelsViewModel(val application: Application, val repo: DatabaseRepo) :
     }
 
     fun setActiveAccount(account: Account?) {
-        Timber.e("Active account at the moment is $account")
-        activeAccount.postValue(account!!)
+        account?.let { activeAccount.postValue(it) }
     }
 
     private fun setActiveChannel(channelId: Int, accountId: Int) {
-        val channelAccounts = repo.getChannelAndAccounts(channelId)
-        channelAccounts?.let {
-            Timber.e("Active channel ${it.channel}")
-            activeChannel.postValue(it.channel)
-
+        val txnChannelAccounts = repo.getChannelAndAccounts(channelId)
+
+        /* Handles instances where a channel without accounts e.g Stax Airtime was used.
+        ** Fetches the channel from the account instead. Active channel remains as was in transaction.
+        */
+        val c = if (txnChannelAccounts != null && txnChannelAccounts.accounts.isEmpty()) {
+            val a = repo.getAccount(accountId)
+            repo.getChannelAndAccounts(a!!.channelId)
+        } else
+            txnChannelAccounts
+
+        c?.let {
+            activeChannel.postValue(txnChannelAccounts?.channel ?: it.channel)
             setActiveAccount(it.accounts.firstOrNull { account -> account.id == accountId })
         }
     }
 
+    fun setActiveChannelAndAccount(channelId: Int, accountChannelId: Int) = viewModelScope.launch(Dispatchers.IO) {
+        val channel = repo.getChannel(channelId)
+        channel?.let { setActiveChannel(it) } ?: run { Timber.e("Airtime channel with id $channelId not found") }
+
+        val accounts = repo.getAccounts(accountChannelId)
+        if (accounts.isNotEmpty()) {
+            setActiveAccount(accounts.firstOrNull())
+        } else {
+            repo.getChannel(accountChannelId)?.let {
+                setChannelsSelected(listOf(it))
+                createAccounts(listOf(it))
+            }
+
+            setActiveAccount(repo.getAccounts(accountChannelId).firstOrNull())
+        }
+    }
+
     private fun loadActions(t: String?) {
         if (t == null) return
 
@@ -229,7 +256,7 @@ class ChannelsViewModel(val application: Application, val repo: DatabaseRepo) :
     }
 
     private fun loadActions(channels: List<Channel>) {
-        if (channels.isNullOrEmpty()) return
+        if (channels.isEmpty()) return
 
         if (type.value == HoverAction.BALANCE)
             loadActions(channels, type.value!!)
@@ -238,7 +265,8 @@ class ChannelsViewModel(val application: Application, val repo: DatabaseRepo) :
     private fun loadActions(channel: Channel, t: String) = viewModelScope.launch(Dispatchers.IO) {
         channelActions.postValue(
             if (t == HoverAction.P2P) repo.getTransferActions(channel.id)
-            else repo.getActions(channel.id, t))
+            else repo.getActions(channel.id, t)
+        )
     }
 
     private fun loadAccounts() = viewModelScope.launch {
@@ -253,18 +281,16 @@ class ChannelsViewModel(val application: Application, val repo: DatabaseRepo) :
         }
     }
 
-    fun setChannelsSelected(channels: List<Channel>?) {
-        viewModelScope.launch(Dispatchers.IO) {
-            if (channels.isNullOrEmpty()) return@launch
+    fun setChannelsSelected(channels: List<Channel>?) = viewModelScope.launch(Dispatchers.IO) {
+        if (channels.isNullOrEmpty()) return@launch
 
-            channels.forEachIndexed { index, channel ->
-                logChoice(channel)
-                channel.selected = true
-                channel.defaultAccount = selectedChannels.value.isNullOrEmpty() && index == 0
-                repo.update(channel)
+        channels.forEachIndexed { index, channel ->
+            logChoice(channel)
+            channel.selected = true
+            channel.defaultAccount = selectedChannels.value.isNullOrEmpty() && index == 0
+            repo.update(channel)
 
-                ActionApi.scheduleActionConfigUpdate(channel.countryAlpha2, 24, application)
-            }
+            ActionApi.scheduleActionConfigUpdate(channel.countryAlpha2, 24, application)
         }
     }
 
@@ -320,6 +346,8 @@ class ChannelsViewModel(val application: Application, val repo: DatabaseRepo) :
 
     fun getChannel(channelId: Int): Channel? = repo.getChannel(channelId)
 
+    fun getChannelAndAccounts(channelId: Int): ChannelWithAccounts? = repo.getChannelAndAccounts(channelId)
+
     fun createAccounts(channels: List<Channel>) = viewModelScope.launch(Dispatchers.IO) {
         val defaultAccount = repo.getDefaultAccount()
 
@@ -327,18 +355,12 @@ class ChannelsViewModel(val application: Application, val repo: DatabaseRepo) :
             with(it) {
                 val accountName: String = if (getFetchAccountAction(it.id) == null) name else Constants.PLACEHOLDER //placeholder alias for easier identification later
                 val account = Account(accountName, name, logoUrl, accountNo, id, primaryColorHex, secondaryColorHex, defaultAccount == null)
+
                 repo.insert(account)
             }
         }
     }
 
-    @Deprecated(message = "Newer versions of the app don't need this", replaceWith = ReplaceWith(""), level = DeprecationLevel.WARNING)
-    fun migrateAccounts() = viewModelScope.launch(Dispatchers.IO) {
-        if (accounts.value.isNullOrEmpty() && !selectedChannels.value.isNullOrEmpty()) {
-            createAccounts(selectedChannels.value!!)
-        }
-    }
-
     fun fetchAccounts(channelId: Int) = viewModelScope.launch(Dispatchers.IO) {
         val channelAccounts = repo.getAccounts(channelId)
         accounts.postValue(channelAccounts)
@@ -346,7 +368,7 @@ class ChannelsViewModel(val application: Application, val repo: DatabaseRepo) :
 
     private fun updateAccounts() = viewModelScope.launch(Dispatchers.IO) {
         val savedAccounts = repo.getAllAccounts()
-        if (savedAccounts.isNullOrEmpty()) return@launch
+        if (savedAccounts.isEmpty()) return@launch
 
         if (savedAccounts.none { it.isDefault }) {
             val defaultChannel: Channel? = selectedChannels.value?.firstOrNull { it.defaultAccount }
@@ -360,9 +382,9 @@ class ChannelsViewModel(val application: Application, val repo: DatabaseRepo) :
         }
     }
 
-    override fun highlightAccount(account: Account) {
+    override fun highlightAccount(account: Account, channelOverride: Int) {
         viewModelScope.launch(Dispatchers.IO) {
-            val channel = repo.getChannel(account.channelId)
+            val channel = repo.getChannel(if (channelOverride != 0) channelOverride else account.channelId)
             setActiveChannel(channel!!)
             activeAccount.postValue(account)
         }
@@ -372,8 +394,9 @@ class ChannelsViewModel(val application: Application, val repo: DatabaseRepo) :
         if (!accounts.value.isNullOrEmpty()) {
             val accts = accounts.value!!
             //remove current default account
-            val current: Account? = accts.firstOrNull { it.isDefault }
-            current?.isDefault = false
+            val current: Account? = accts.firstOrNull { it.isDefault }.also {
+                it?.isDefault = false
+            }
             repo.update(current)
 
             val a = accts.first { it.id == account.id }
diff --git a/app/src/main/java/com/hover/stax/channels/ImportChannelsWorker.kt b/app/src/main/java/com/hover/stax/channels/ImportChannelsWorker.kt
index dfa961d39..c32788b16 100644
--- a/app/src/main/java/com/hover/stax/channels/ImportChannelsWorker.kt
+++ b/app/src/main/java/com/hover/stax/channels/ImportChannelsWorker.kt
@@ -7,7 +7,6 @@ import android.content.Context
 import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.work.*
-import androidx.work.impl.utils.futures.SettableFuture
 import com.hover.stax.BuildConfig
 import com.hover.stax.R
 import com.hover.stax.database.AppDatabase
diff --git a/app/src/main/java/com/hover/stax/contacts/PhoneHelper.java b/app/src/main/java/com/hover/stax/contacts/PhoneHelper.java
deleted file mode 100644
index 4df643dbc..000000000
--- a/app/src/main/java/com/hover/stax/contacts/PhoneHelper.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.hover.stax.contacts;
-
-import android.util.Log;
-
-import com.google.i18n.phonenumbers.NumberParseException;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
-import com.google.i18n.phonenumbers.Phonenumber;
-import com.hover.sdk.actions.HoverAction;
-import com.hover.stax.channels.Channel;
-import com.hover.stax.utils.AnalyticsUtil;
-
-public class PhoneHelper {
-    final static private String TAG = "PhoneHelper";
-
-    public static String normalizeNumberByCountry(String number, String from_country, String to_country) {
-        String phoneNumber = number;
-        try {
-            phoneNumber = convertToCountry(number, from_country, to_country);
-            Log.e("Contact", "Normalized number: " + phoneNumber);
-        } catch (NumberParseException e) {
-            Log.e("Contact", "error formating number", e);
-        }
-        return phoneNumber;
-    }
-
-    private static String convertToCountry(String number, String from_country, String to_country) throws NumberParseException, IllegalStateException {
-        PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
-        try {
-            Phonenumber.PhoneNumber phone = phoneUtil.parse(number, to_country);
-//           Most cases we've seen the number format is that used for dialing without the plus
-            number = phoneUtil.formatNumberForMobileDialing(phone, from_country, false).replace("+", "");
-        } catch (IllegalStateException e) {
-            Log.e(TAG, "Google phone number util failed.", e);
-        }
-        return number;
-    }
-
-    public static String getNationalSignificantNumber(String number, String country) {
-        try {
-            PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
-            Phonenumber.PhoneNumber phone = phoneUtil.parse(number, country);
-            return phoneUtil.getNationalSignificantNumber(phone);
-        } catch (NumberParseException | IllegalStateException e) {
-            AnalyticsUtil.logErrorAndReportToFirebase(TAG, "Failed to transform number for contact; doing it the old fashioned way.", e);
-            return number.startsWith("+") ? number.substring(4) : (number.startsWith("0") ? number.substring(1) : number);
-        }
-    }
-
-    public static String getInternationalNumber(String country, String phoneNumber) throws NumberParseException, IllegalStateException {
-        PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
-        Phonenumber.PhoneNumber phone = getPhone(country, phoneNumber);
-        phone.getCountryCode();
-        return phoneUtil.format(phone, PhoneNumberUtil.PhoneNumberFormat.E164);
-    }
-
-
-    public static String getInternationalNumberNoPlus(String accountNumber, String country) {
-        try {
-            return getInternationalNumber(country, accountNumber).replace("+", "");
-        } catch (NumberParseException | IllegalStateException e) {
-            AnalyticsUtil.logErrorAndReportToFirebase(TAG, "Failed to transform number for contact; doing it the old fashioned way.", e);
-            return accountNumber.replace("+", "");
-        }
-    }
-
-    private static Phonenumber.PhoneNumber getPhone(String country, String phoneNumber) throws NumberParseException, IllegalStateException {
-        PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
-        return phoneUtil.parse(phoneNumber, country);
-    }
-}
diff --git a/app/src/main/java/com/hover/stax/contacts/PhoneHelper.kt b/app/src/main/java/com/hover/stax/contacts/PhoneHelper.kt
new file mode 100644
index 000000000..27850c4e6
--- /dev/null
+++ b/app/src/main/java/com/hover/stax/contacts/PhoneHelper.kt
@@ -0,0 +1,79 @@
+package com.hover.stax.contacts
+
+import com.google.i18n.phonenumbers.NumberParseException
+import com.google.i18n.phonenumbers.PhoneNumberUtil
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber
+import com.hover.stax.utils.AnalyticsUtil.logErrorAndReportToFirebase
+import timber.log.Timber
+
+object PhoneHelper {
+
+    private const val TAG = "PhoneHelper"
+
+    fun normalizeNumberByCountry(number: String, from_country: String, to_country: String): String {
+        var phoneNumber = number
+        try {
+            phoneNumber = convertToCountry(number, from_country, to_country)
+            Timber.e("Normalized number: $phoneNumber")
+        } catch (e: NumberParseException) {
+            Timber.e(e, "error formatting number")
+        }
+
+        return phoneNumber
+    }
+
+    @Throws(NumberParseException::class, IllegalStateException::class)
+    private fun convertToCountry(num: String, from_country: String, to_country: String): String {
+        var number = num
+        val phoneUtil = PhoneNumberUtil.getInstance()
+        try {
+            val phone = phoneUtil.parse(number, to_country)
+            //           Most cases we've seen the number format is that used for dialing without the plus
+            number = phoneUtil.formatNumberForMobileDialing(phone, from_country, false).replace("+", "")
+        } catch (e: IllegalStateException) {
+            Timber.e(e, "Google phone number util failed.")
+        }
+        return number
+    }
+
+    @JvmStatic
+    fun getNationalSignificantNumber(number: String, country: String?): String {
+        return try {
+            val phoneUtil = PhoneNumberUtil.getInstance()
+            val phone = phoneUtil.parse(number, country)
+            phoneUtil.getNationalSignificantNumber(phone)
+        } catch (e: NumberParseException) {
+            logErrorAndReportToFirebase(TAG, "Failed to transform number for contact; doing it the old fashioned way.", e)
+            if (number.startsWith("+")) number.substring(4) else if (number.startsWith("0")) number.substring(1) else number
+        } catch (e: IllegalStateException) {
+            logErrorAndReportToFirebase(TAG, "Failed to transform number for contact; doing it the old fashioned way.", e)
+            if (number.startsWith("+")) number.substring(4) else if (number.startsWith("0")) number.substring(1) else number
+        }
+    }
+
+    @Throws(NumberParseException::class, IllegalStateException::class)
+    fun getInternationalNumber(country: String, phoneNumber: String): String {
+        val phoneUtil = PhoneNumberUtil.getInstance()
+        val phone = getPhone(country, phoneNumber)
+        phone.countryCode
+        return phoneUtil.format(phone, PhoneNumberUtil.PhoneNumberFormat.E164)
+    }
+
+    fun getInternationalNumberNoPlus(accountNumber: String, country: String): String {
+        return try {
+            getInternationalNumber(country, accountNumber).replace("+", "")
+        } catch (e: NumberParseException) {
+            logErrorAndReportToFirebase(TAG, "Failed to transform number for contact; doing it the old fashioned way.", e)
+            accountNumber.replace("+", "")
+        } catch (e: IllegalStateException) {
+            logErrorAndReportToFirebase(TAG, "Failed to transform number for contact; doing it the old fashioned way.", e)
+            accountNumber.replace("+", "")
+        }
+    }
+
+    @Throws(NumberParseException::class, IllegalStateException::class)
+    private fun getPhone(country: String, phoneNumber: String): PhoneNumber {
+        val phoneUtil = PhoneNumberUtil.getInstance()
+        return phoneUtil.parse(phoneNumber, country)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hover/stax/countries/CountryDropdown.kt b/app/src/main/java/com/hover/stax/countries/CountryDropdown.kt
index f55cb5393..3f54d5975 100644
--- a/app/src/main/java/com/hover/stax/countries/CountryDropdown.kt
+++ b/app/src/main/java/com/hover/stax/countries/CountryDropdown.kt
@@ -13,7 +13,7 @@ class CountryDropdown(context: Context, attributeSet: AttributeSet) : StaxDropdo
     private var selectListener: CountryAdapter.SelectListener? = null
 
     fun updateChoices(channels: List<Channel>, currentCountry: String?) {
-        if (channels.isNullOrEmpty()) {
+        if (channels.isEmpty()) {
             setEmptyState()
             return
         }
diff --git a/app/src/main/java/com/hover/stax/database/AppDatabase.kt b/app/src/main/java/com/hover/stax/database/AppDatabase.kt
index 326b39696..4e0be481b 100644
--- a/app/src/main/java/com/hover/stax/database/AppDatabase.kt
+++ b/app/src/main/java/com/hover/stax/database/AppDatabase.kt
@@ -8,6 +8,8 @@ import androidx.room.RoomDatabase
 import androidx.room.migration.Migration
 import com.hover.stax.accounts.Account
 import com.hover.stax.accounts.AccountDao
+import com.hover.stax.bonus.Bonus
+import com.hover.stax.bonus.BonusDao
 import com.hover.stax.channels.Channel
 import com.hover.stax.channels.ChannelDao
 import com.hover.stax.contacts.ContactDao
@@ -27,12 +29,13 @@ import java.util.concurrent.Executors
 
 @Database(
     entities = [
-        Channel::class, StaxTransaction::class, StaxContact::class, Request::class, Schedule::class, Account::class, Paybill::class, StaxUser::class
+        Channel::class, StaxTransaction::class, StaxContact::class, Request::class, Schedule::class, Account::class, Paybill::class, StaxUser::class, Bonus::class
     ],
-    version = 38,
+    version = 39,
     autoMigrations = [
         AutoMigration(from = 36, to = 37),
-        AutoMigration(from = 37, to = 38)
+        AutoMigration(from = 37, to = 38),
+        AutoMigration(from = 38, to = 39)
     ]
 )
 abstract class AppDatabase : RoomDatabase() {
@@ -53,6 +56,8 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract fun userDao(): UserDao
 
+    abstract fun bonusDao(): BonusDao
+
     companion object {
 
         @Volatile
diff --git a/app/src/main/java/com/hover/stax/database/Converters.kt b/app/src/main/java/com/hover/stax/database/Converters.kt
index 9a31b7167..dbd33d33e 100644
--- a/app/src/main/java/com/hover/stax/database/Converters.kt
+++ b/app/src/main/java/com/hover/stax/database/Converters.kt
@@ -1,8 +1,6 @@
 package com.hover.stax.database
 
 import androidx.room.TypeConverter
-import java.lang.StringBuilder
-import java.util.*
 
 class Converters {
 
diff --git a/app/src/main/java/com/hover/stax/database/DatabaseRepo.kt b/app/src/main/java/com/hover/stax/database/DatabaseRepo.kt
index ad9e0356d..c5918fdbb 100644
--- a/app/src/main/java/com/hover/stax/database/DatabaseRepo.kt
+++ b/app/src/main/java/com/hover/stax/database/DatabaseRepo.kt
@@ -10,7 +10,6 @@ import com.hover.sdk.actions.HoverActionDao
 import com.hover.sdk.database.HoverRoomDatabase
 import com.hover.sdk.sims.SimInfo
 import com.hover.sdk.sims.SimInfoDao
-import com.hover.sdk.transactions.Transaction
 import com.hover.sdk.transactions.TransactionContract
 import com.hover.stax.R
 import com.hover.stax.accounts.Account
@@ -88,7 +87,7 @@ class DatabaseRepo(db: AppDatabase, sdkDb: HoverRoomDatabase) {
     val presentSims: List<SimInfo>
         get() = simDao.present
 
-    fun getSims(hnis: Array<String?>?): List<SimInfo> {
+    fun getSims(hnis: Array<String>): List<SimInfo> {
         return simDao.getPresentByHnis(hnis)
     }
 
diff --git a/app/src/main/java/com/hover/stax/database/Modules.kt b/app/src/main/java/com/hover/stax/database/Modules.kt
index 027a2f77a..f89cdb9af 100644
--- a/app/src/main/java/com/hover/stax/database/Modules.kt
+++ b/app/src/main/java/com/hover/stax/database/Modules.kt
@@ -4,6 +4,8 @@ import com.hover.sdk.database.HoverRoomDatabase
 import com.hover.stax.accounts.AccountDetailViewModel
 import com.hover.stax.actions.ActionSelectViewModel
 import com.hover.stax.balances.BalancesViewModel
+import com.hover.stax.bonus.BonusRepo
+import com.hover.stax.bonus.BonusViewModel
 import com.hover.stax.bounties.BountyViewModel
 import com.hover.stax.channels.ChannelsViewModel
 import com.hover.stax.faq.FaqViewModel
@@ -12,7 +14,6 @@ import com.hover.stax.futureTransactions.FutureViewModel
 import com.hover.stax.inapp_banner.BannerViewModel
 import com.hover.stax.languages.LanguageViewModel
 import com.hover.stax.login.LoginNetworking
-import com.hover.stax.ussd_library.LibraryViewModel
 import com.hover.stax.login.LoginViewModel
 import com.hover.stax.paybill.PaybillRepo
 import com.hover.stax.paybill.PaybillViewModel
@@ -23,6 +24,7 @@ import com.hover.stax.transactions.TransactionDetailsViewModel
 import com.hover.stax.transactions.TransactionHistoryViewModel
 import com.hover.stax.transfers.TransferViewModel
 import com.hover.stax.user.UserRepo
+import com.hover.stax.ussd_library.LibraryViewModel
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 
@@ -39,13 +41,14 @@ val appModule = module {
     viewModel { BannerViewModel(get(), get()) }
     viewModel { FutureViewModel(get()) }
     viewModel { LoginViewModel(get(), get(), get(), get()) }
-    viewModel { TransactionDetailsViewModel(get(), get()) }
+    viewModel { TransactionDetailsViewModel(get(), get(), get()) }
     viewModel { LibraryViewModel(get(), get()) }
     viewModel { LanguageViewModel(get()) }
     viewModel { BountyViewModel(get(), get()) }
     viewModel { FinancialTipsViewModel() }
     viewModel { PaybillViewModel(get(), get(), get()) }
     viewModel { RequestDetailViewModel(get()) }
+    viewModel { BonusViewModel(get(), get()) }
 }
 
 val dataModule = module(createdAtStart = true) {
@@ -55,6 +58,7 @@ val dataModule = module(createdAtStart = true) {
     single { DatabaseRepo(get(), get()) }
     single { PaybillRepo(get()) }
     single { UserRepo(get()) }
+    single { BonusRepo(get()) }
 }
 
 val networkModule = module {
diff --git a/app/src/main/java/com/hover/stax/faq/FaqFragment.kt b/app/src/main/java/com/hover/stax/faq/FaqFragment.kt
index c4ef74aea..01d65bb91 100644
--- a/app/src/main/java/com/hover/stax/faq/FaqFragment.kt
+++ b/app/src/main/java/com/hover/stax/faq/FaqFragment.kt
@@ -1,7 +1,6 @@
 package com.hover.stax.faq
 
 import android.os.Bundle
-import android.text.Html
 import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
@@ -13,7 +12,6 @@ import com.hover.stax.R
 import com.hover.stax.databinding.FragmentFaqBinding
 import com.hover.stax.utils.AnalyticsUtil
 import com.hover.stax.utils.UIHelper
-import com.hover.stax.utils.Utils
 import com.hover.stax.utils.network.NetworkMonitor
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
diff --git a/app/src/main/java/com/hover/stax/futureTransactions/RequestsAdapter.kt b/app/src/main/java/com/hover/stax/futureTransactions/RequestsAdapter.kt
index 73e0e6b49..ee3c6f4cd 100644
--- a/app/src/main/java/com/hover/stax/futureTransactions/RequestsAdapter.kt
+++ b/app/src/main/java/com/hover/stax/futureTransactions/RequestsAdapter.kt
@@ -1,14 +1,14 @@
 package com.hover.stax.futureTransactions
 
-import com.hover.stax.utils.Utils.formatAmount
-import com.hover.stax.utils.DateUtils.humanFriendlyDate
-import androidx.recyclerview.widget.RecyclerView
-import com.hover.stax.futureTransactions.RequestsAdapter.RequestsViewHolder
-import android.view.ViewGroup
 import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
 import com.hover.stax.databinding.TransactionListItemBinding
+import com.hover.stax.futureTransactions.RequestsAdapter.RequestsViewHolder
 import com.hover.stax.requests.Request
+import com.hover.stax.utils.DateUtils.humanFriendlyDate
+import com.hover.stax.utils.Utils.formatAmount
 
 class RequestsAdapter(private var requestList: List<Request>?,
                       private val selectListener: SelectListener) :
diff --git a/app/src/main/java/com/hover/stax/home/AbstractSDKCaller.kt b/app/src/main/java/com/hover/stax/home/AbstractSDKCaller.kt
index b64db3d62..3888eb553 100644
--- a/app/src/main/java/com/hover/stax/home/AbstractSDKCaller.kt
+++ b/app/src/main/java/com/hover/stax/home/AbstractSDKCaller.kt
@@ -10,11 +10,10 @@ import com.hover.stax.actions.ActionSelectViewModel
 import com.hover.stax.balances.BalancesViewModel
 import com.hover.stax.channels.Channel
 import com.hover.stax.channels.ChannelsViewModel
-import com.hover.stax.contacts.PhoneHelper
 import com.hover.stax.hover.HoverSession
 import com.hover.stax.login.AbstractGoogleAuthActivity
-import com.hover.stax.paybill.PaybillViewModel
 import com.hover.stax.notifications.PushNotificationTopicsInterface
+import com.hover.stax.paybill.PaybillViewModel
 import com.hover.stax.transactions.StaxTransaction
 import com.hover.stax.transactions.TransactionHistoryViewModel
 import com.hover.stax.transfers.TransactionType
@@ -23,7 +22,6 @@ import com.hover.stax.utils.AnalyticsUtil
 import com.hover.stax.utils.Constants
 import com.hover.stax.utils.UIHelper
 import com.hover.stax.utils.Utils
-import io.sentry.util.StringUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.json.JSONException
@@ -112,7 +110,8 @@ abstract class AbstractSDKCaller : AbstractGoogleAuthActivity(), PushNotificatio
             }
 
             selectedAccount?.run { hsb.setAccountId(id.toString()) }
-            transferViewModel.contact.value?.let { addRecipientInfo(hsb) }
+            transferViewModel.contact.value?.let {
+                addRecipientInfo(hsb) }
         }
 
         runAction(hsb)
diff --git a/app/src/main/java/com/hover/stax/home/HomeFragment.kt b/app/src/main/java/com/hover/stax/home/HomeFragment.kt
index 16d12c49a..28424dcc9 100644
--- a/app/src/main/java/com/hover/stax/home/HomeFragment.kt
+++ b/app/src/main/java/com/hover/stax/home/HomeFragment.kt
@@ -1,23 +1,31 @@
 package com.hover.stax.home
 
 import android.os.Bundle
+import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavDirections
 import androidx.navigation.fragment.findNavController
 import com.hover.sdk.actions.HoverAction
 import com.hover.stax.R
+import com.hover.stax.bonus.Bonus
+import com.hover.stax.bonus.BonusViewModel
+import com.hover.stax.channels.ChannelsViewModel
 import com.hover.stax.databinding.FragmentHomeBinding
 import com.hover.stax.financialTips.FinancialTip
 import com.hover.stax.financialTips.FinancialTipsViewModel
-import com.hover.stax.inapp_banner.BannerViewModel
 import com.hover.stax.utils.AnalyticsUtil
 import com.hover.stax.utils.Constants
 import com.hover.stax.utils.NavUtil
 import com.hover.stax.utils.Utils
 import com.hover.stax.utils.network.NetworkMonitor
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import timber.log.Timber
 
@@ -27,8 +35,9 @@ class HomeFragment : Fragment() {
     private var _binding: FragmentHomeBinding? = null
     private val binding get() = _binding!!
 
-    private val bannerViewModel: BannerViewModel by viewModel()
     private val wellnessViewModel: FinancialTipsViewModel by viewModel()
+    private val bonusViewModel: BonusViewModel by sharedViewModel()
+    private val channelsViewModel: ChannelsViewModel by sharedViewModel()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         AnalyticsUtil.logAnalyticsEvent(getString(R.string.visit_screen, getString(R.string.visit_home)), requireContext())
@@ -39,6 +48,7 @@ class HomeFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
         setupBanner()
 
         binding.airtime.setOnClickListener { navigateTo(getTransferDirection(HoverAction.AIRTIME)) }
@@ -51,23 +61,27 @@ class HomeFragment : Fragment() {
         setUpWellnessTips()
     }
 
-    private fun getTransferDirection(type: String) : NavDirections {
-        return HomeFragmentDirections.actionNavigationHomeToNavigationTransfer(type)
+    private fun getTransferDirection(type: String, channelId: Int = 0): NavDirections {
+        return HomeFragmentDirections.actionNavigationHomeToNavigationTransfer(type).setChannelId(channelId)
     }
-    private fun setupBanner() {
-        with(bannerViewModel) {
-            qualifiedBanner.observe(viewLifecycleOwner) { banner ->
-                if (banner != null) {
-                    AnalyticsUtil.logAnalyticsEvent(getString(R.string.displaying_in_app_banner, banner.id), requireContext())
-                    binding.homeBanner.visibility = View.VISIBLE
-                    binding.homeBanner.display(banner)
-
-                    binding.homeBanner.setOnClickListener {
-                        AnalyticsUtil.logAnalyticsEvent(getString(R.string.clicked_on_banner), requireContext())
-                        Utils.openUrl(banner.url, requireActivity())
-                        closeCampaign(banner.id)
+
+    private fun setupBanner() = lifecycleScope.launchWhenResumed {
+        with(bonusViewModel) {
+            bonuses.observe(viewLifecycleOwner) { b ->
+                if (b.isNotEmpty()) {
+                    with(binding.bonusCard) {
+                        message.text = b.first().message
+                        learnMore.movementMethod = LinkMovementMethod.getInstance()
+                    }
+                    binding.bonusCard.apply {
+                        cardBonus.visibility = View.VISIBLE
+                        cta.setOnClickListener {
+                            channelsViewModel // viewmodel must be instantiated in the main thread before it can be accessible on other threads
+                            AnalyticsUtil.logAnalyticsEvent(getString(R.string.clicked_bonus_airtime_banner), requireActivity())
+                            validateTransferAction(b.first())
+                        }
                     }
-                } else binding.homeBanner.visibility = View.GONE
+                } else binding.bonusCard.cardBonus.visibility = View.GONE
             }
         }
     }
@@ -128,6 +142,22 @@ class HomeFragment : Fragment() {
         }
     }
 
+    private fun validateTransferAction(bonus: Bonus) = lifecycleScope.launch(Dispatchers.IO) {
+        val channelAccounts = channelsViewModel.getChannelAndAccounts(bonus.userChannel)
+
+        if(channelAccounts != null && channelAccounts.accounts.isEmpty()) {
+            val channels = listOf(channelAccounts.channel)
+            channelsViewModel.apply {
+                setChannelsSelected(channels)
+                createAccounts(channels)
+            }
+        }
+
+        withContext(Dispatchers.Main) {
+            navigateTo(getTransferDirection(HoverAction.AIRTIME, bonus.purchaseChannel))
+        }
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
diff --git a/app/src/main/java/com/hover/stax/home/MainActivity.kt b/app/src/main/java/com/hover/stax/home/MainActivity.kt
index 2229580b5..b0f3d82a6 100644
--- a/app/src/main/java/com/hover/stax/home/MainActivity.kt
+++ b/app/src/main/java/com/hover/stax/home/MainActivity.kt
@@ -14,6 +14,7 @@ import com.hover.stax.accounts.DUMMY
 import com.hover.stax.actions.ActionSelectViewModel
 import com.hover.stax.balances.BalanceAdapter
 import com.hover.stax.balances.BalancesViewModel
+import com.hover.stax.bonus.BonusViewModel
 import com.hover.stax.databinding.ActivityMainBinding
 import com.hover.stax.financialTips.FinancialTipsFragment
 import com.hover.stax.login.LoginViewModel
@@ -26,6 +27,7 @@ import com.hover.stax.transactions.TransactionHistoryViewModel
 import com.hover.stax.transfers.TransferViewModel
 import com.hover.stax.utils.*
 import com.hover.stax.views.StaxDialog
+import com.uxcam.UXCam
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import timber.log.Timber
 
@@ -37,6 +39,8 @@ class MainActivity : AbstractRequestActivity(), BalancesViewModel.RunBalanceList
     private val transferViewModel: TransferViewModel by viewModel()
     private val historyViewModel: TransactionHistoryViewModel by viewModel()
     private val loginViewModel: LoginViewModel by viewModel()
+    private val bonusViewModel: BonusViewModel by viewModel()
+
     private val bountyRequest = 3000
 
     private lateinit var binding: ActivityMainBinding
@@ -58,6 +62,8 @@ class MainActivity : AbstractRequestActivity(), BalancesViewModel.RunBalanceList
         checkForFragmentDirection(intent)
         observeForAppReview()
         setGoogleLoginInterface(this)
+
+        bonusViewModel.getBonuses()
     }
 
     override fun onNewIntent(intent: Intent?) {
@@ -145,7 +151,7 @@ class MainActivity : AbstractRequestActivity(), BalancesViewModel.RunBalanceList
     private fun showPopUpTransactionDetailsIfRequired(data: Intent?) {
         if (data != null && data.extras != null && data.extras!!.getString("uuid") != null) {
             transferViewModel.reset()
-            navHelper.showTxnDetails(data.extras!!.getString("uuid")!!)
+            navHelper.showTxnDetails(data.extras!!.getString("uuid")!!, true)
         }
 
 //        else {
diff --git a/app/src/main/java/com/hover/stax/home/NavHelper.kt b/app/src/main/java/com/hover/stax/home/NavHelper.kt
index 782452b6f..f1afe21cb 100644
--- a/app/src/main/java/com/hover/stax/home/NavHelper.kt
+++ b/app/src/main/java/com/hover/stax/home/NavHelper.kt
@@ -46,7 +46,7 @@ class NavHelper(val activity: AppCompatActivity) {
 
     fun navigateToBountyList() = NavUtil.navigate(getNavController(), BountyEmailFragmentDirections.actionBountyEmailFragmentToBountyListFragment())
 
-    fun showTxnDetails(uuid: String) = NavUtil.showTransactionDetailsFragment(getNavController(), uuid)
+    fun showTxnDetails(uuid: String, isNewTransaction: Boolean? = false) = NavUtil.showTransactionDetailsFragment(getNavController(), uuid, isNewTransaction!!)
 
     fun navigateTransfer(type: String, txnUUID: String? = null) {
         val transferDirection = MainNavigationDirections.actionGlobalTransferFragment(type)
diff --git a/app/src/main/java/com/hover/stax/inapp_banner/BannerViewModel.kt b/app/src/main/java/com/hover/stax/inapp_banner/BannerViewModel.kt
index d5c1a4915..a51e3d366 100644
--- a/app/src/main/java/com/hover/stax/inapp_banner/BannerViewModel.kt
+++ b/app/src/main/java/com/hover/stax/inapp_banner/BannerViewModel.kt
@@ -1,7 +1,6 @@
 package com.hover.stax.inapp_banner
 
 import android.app.Application
-import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
diff --git a/app/src/main/java/com/hover/stax/languages/LanguageSelectFragment.kt b/app/src/main/java/com/hover/stax/languages/LanguageSelectFragment.kt
index a0aba079c..9fcad637a 100644
--- a/app/src/main/java/com/hover/stax/languages/LanguageSelectFragment.kt
+++ b/app/src/main/java/com/hover/stax/languages/LanguageSelectFragment.kt
@@ -33,6 +33,7 @@ class LanguageSelectFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
         AnalyticsUtil.logAnalyticsEvent(getString(R.string.visit_screen, getString(R.string.visit_language)), requireActivity())
 
         selectedCode = Lingver.getInstance().getLanguage()
diff --git a/app/src/main/java/com/hover/stax/login/AbstractGoogleAuthActivity.kt b/app/src/main/java/com/hover/stax/login/AbstractGoogleAuthActivity.kt
index b6440d26b..aa18a1979 100644
--- a/app/src/main/java/com/hover/stax/login/AbstractGoogleAuthActivity.kt
+++ b/app/src/main/java/com/hover/stax/login/AbstractGoogleAuthActivity.kt
@@ -14,6 +14,7 @@ import com.google.android.play.core.install.InstallStateUpdatedListener
 import com.google.android.play.core.install.model.AppUpdateType
 import com.google.android.play.core.install.model.InstallStatus
 import com.google.android.play.core.install.model.UpdateAvailability
+import com.hover.stax.BuildConfig
 import com.hover.stax.R
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import timber.log.Timber
@@ -32,22 +33,25 @@ abstract class AbstractGoogleAuthActivity : AppCompatActivity() {
         setLoginObserver()
 
         updateManager = AppUpdateManagerFactory.create(this)
-        checkForUpdates()
+
+        if (!BuildConfig.DEBUG)
+            checkForUpdates()
     }
 
     //checks that the update has not stalled
     override fun onResume() {
         super.onResume()
-        updateManager.appUpdateInfo.addOnSuccessListener { updateInfo ->
-            //if the update is downloaded but not installed, notify user to complete the update
-            if (updateInfo.installStatus() == InstallStatus.DOWNLOADED)
-                showSnackbarForCompleteUpdate()
-
-            //if an in-app update is already running, resume the update
-            if(updateInfo.updateAvailability() == UpdateAvailability.DEVELOPER_TRIGGERED_UPDATE_IN_PROGRESS) {
-                updateManager.startUpdateFlowForResult(updateInfo, AppUpdateType.IMMEDIATE, this, UPDATE_REQUEST_CODE)
+        if (!BuildConfig.DEBUG)
+            updateManager.appUpdateInfo.addOnSuccessListener { updateInfo ->
+                //if the update is downloaded but not installed, notify user to complete the update
+                if (updateInfo.installStatus() == InstallStatus.DOWNLOADED)
+                    showSnackbarForCompleteUpdate()
+
+                //if an in-app update is already running, resume the update
+                if (updateInfo.updateAvailability() == UpdateAvailability.DEVELOPER_TRIGGERED_UPDATE_IN_PROGRESS) {
+                    updateManager.startUpdateFlowForResult(updateInfo, AppUpdateType.IMMEDIATE, this, UPDATE_REQUEST_CODE)
+                }
             }
-        }
     }
 
     fun setGoogleLoginInterface(staxGoogleLoginInterface: StaxGoogleLoginInterface) {
@@ -75,18 +79,21 @@ abstract class AbstractGoogleAuthActivity : AppCompatActivity() {
     fun signIn() = startActivityForResult(loginViewModel.signInClient.signInIntent, LOGIN_REQUEST)
 
     private fun checkForUpdates() {
-        val updateInfoTask = updateManager.appUpdateInfo
-
-        updateInfoTask.addOnSuccessListener { updateInfo ->
-            val updateType = if ((updateInfo.clientVersionStalenessDays() ?: -1) <= DAYS_FOR_FLEXIBLE_UPDATE)
-                AppUpdateType.FLEXIBLE
-            else
-                AppUpdateType.IMMEDIATE
-
-            if (updateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE && updateInfo.isUpdateTypeAllowed(updateType))
-                requestUpdate(updateInfo, updateType)
-            else
-                Timber.i("No new update available")
+        if (BuildConfig.DEBUG) {
+            val updateInfoTask = updateManager.appUpdateInfo
+
+            updateInfoTask.addOnSuccessListener { updateInfo ->
+                val updateType = if ((updateInfo.clientVersionStalenessDays()
+                        ?: -1) <= DAYS_FOR_FLEXIBLE_UPDATE
+                ) AppUpdateType.FLEXIBLE
+                else AppUpdateType.IMMEDIATE
+
+                if (updateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE && updateInfo.isUpdateTypeAllowed(
+                        updateType
+                    )
+                ) requestUpdate(updateInfo, updateType)
+                else Timber.i("No new update available")
+            }
         }
     }
 
@@ -97,7 +104,7 @@ abstract class AbstractGoogleAuthActivity : AppCompatActivity() {
                     showSnackbarForCompleteUpdate()
             }
             updateManager.registerListener(installListener!!)
-        } 
+        }
 
         updateManager.startUpdateFlowForResult(updateInfo, updateType, this, UPDATE_REQUEST_CODE)
     }
diff --git a/app/src/main/java/com/hover/stax/login/LoginNetworking.kt b/app/src/main/java/com/hover/stax/login/LoginNetworking.kt
index 6d86f7eec..d987701ca 100644
--- a/app/src/main/java/com/hover/stax/login/LoginNetworking.kt
+++ b/app/src/main/java/com/hover/stax/login/LoginNetworking.kt
@@ -1,7 +1,6 @@
 package com.hover.stax.login
 
 import android.content.Context
-import com.google.gson.JsonObject
 import com.hover.sdk.api.Hover
 import com.hover.stax.R
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
@@ -10,7 +9,6 @@ import okhttp3.Request
 import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
-
 import org.json.JSONObject
 import timber.log.Timber
 
diff --git a/app/src/main/java/com/hover/stax/notifications/PushNotificationTopicsInterface.kt b/app/src/main/java/com/hover/stax/notifications/PushNotificationTopicsInterface.kt
index aad43029a..8e00b9d81 100644
--- a/app/src/main/java/com/hover/stax/notifications/PushNotificationTopicsInterface.kt
+++ b/app/src/main/java/com/hover/stax/notifications/PushNotificationTopicsInterface.kt
@@ -1,12 +1,12 @@
 package com.hover.stax.notifications
 
 import android.content.Context
-import com.hover.stax.utils.Utils.setFirebaseMessagingTopic
+import com.google.firebase.messaging.FirebaseMessaging
+import com.hover.stax.R
+import com.hover.stax.utils.Utils.alterFirebaseTopicState
 import com.hover.stax.utils.Utils.isFirebaseTopicInDefaultState
 import com.hover.stax.utils.Utils.removeFirebaseMessagingTopic
-import com.hover.stax.utils.Utils.alterFirebaseTopicState
-import com.hover.stax.R
-import com.google.firebase.messaging.FirebaseMessaging
+import com.hover.stax.utils.Utils.setFirebaseMessagingTopic
 
 interface PushNotificationTopicsInterface {
 
diff --git a/app/src/main/java/com/hover/stax/onboarding/defaultVariant/DefaultVariantFragment.kt b/app/src/main/java/com/hover/stax/onboarding/defaultVariant/DefaultVariantFragment.kt
index 7ce189899..eb8a19bae 100644
--- a/app/src/main/java/com/hover/stax/onboarding/defaultVariant/DefaultVariantFragment.kt
+++ b/app/src/main/java/com/hover/stax/onboarding/defaultVariant/DefaultVariantFragment.kt
@@ -26,6 +26,7 @@ class DefaultVariantFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
         AnalyticsUtil.logAnalyticsEvent(getString(R.string.visit_screen, getString(R.string.visit_onboarding)), requireActivity())
         initContinueButton()
     }
diff --git a/app/src/main/java/com/hover/stax/onboarding/interactiveVariant/InteractiveOnboardingVariant.kt b/app/src/main/java/com/hover/stax/onboarding/interactiveVariant/InteractiveOnboardingVariant.kt
index 95364af49..0b54515ee 100644
--- a/app/src/main/java/com/hover/stax/onboarding/interactiveVariant/InteractiveOnboardingVariant.kt
+++ b/app/src/main/java/com/hover/stax/onboarding/interactiveVariant/InteractiveOnboardingVariant.kt
@@ -7,8 +7,6 @@ import android.view.ViewGroup
 import androidx.activity.OnBackPressedCallback
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
-import com.appsflyer.internal.ac
-import com.hover.stax.OnboardingNavigationDirections
 import com.hover.stax.R
 import com.hover.stax.databinding.FragmentInteractiveOnboardingBinding
 import com.hover.stax.onboarding.OnBoardingActivity
@@ -32,6 +30,7 @@ internal class InteractiveOnboardingVariant : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
         AnalyticsUtil.logAnalyticsEvent(getString(R.string.visit_screen, getString(R.string.visit_interactive)), requireActivity())
 
         setQuestionsClick()
diff --git a/app/src/main/java/com/hover/stax/onboarding/interactiveVariant/InteractiveTutorialFragment.kt b/app/src/main/java/com/hover/stax/onboarding/interactiveVariant/InteractiveTutorialFragment.kt
index fa1331961..08cfe84d2 100644
--- a/app/src/main/java/com/hover/stax/onboarding/interactiveVariant/InteractiveTutorialFragment.kt
+++ b/app/src/main/java/com/hover/stax/onboarding/interactiveVariant/InteractiveTutorialFragment.kt
@@ -4,13 +4,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import com.hover.stax.R
 import com.hover.stax.databinding.FragmentInteractiveTutorialBinding
 import com.hover.stax.onboarding.OnBoardingActivity
-import com.hover.stax.onboarding.welcome.WelcomeFragment
 import com.hover.stax.utils.AnalyticsUtil
 import com.hover.stax.utils.NavUtil
 import org.json.JSONObject
diff --git a/app/src/main/java/com/hover/stax/onboarding/interactiveVariant/NonInteractiveTutorialFragment.kt b/app/src/main/java/com/hover/stax/onboarding/interactiveVariant/NonInteractiveTutorialFragment.kt
index ff1833f68..842a2a69c 100644
--- a/app/src/main/java/com/hover/stax/onboarding/interactiveVariant/NonInteractiveTutorialFragment.kt
+++ b/app/src/main/java/com/hover/stax/onboarding/interactiveVariant/NonInteractiveTutorialFragment.kt
@@ -4,16 +4,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.hover.stax.R
 import com.hover.stax.databinding.FragmentNonInteractiveTutorialBinding
 import com.hover.stax.onboarding.OnBoardingActivity
-import com.hover.stax.onboarding.welcome.WelcomeFragment
 import com.hover.stax.utils.AnalyticsUtil
-import com.hover.stax.utils.Constants
 import com.hover.stax.utils.NavUtil
 
 
@@ -31,6 +28,7 @@ internal class NonInteractiveTutorialFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
         AnalyticsUtil.logAnalyticsEvent(getString(R.string.visit_screen, getString(R.string.visit_non_interactive_tutorial)), requireActivity())
 
         setTopBarClicks()
diff --git a/app/src/main/java/com/hover/stax/onboarding/signInVariant/SignInVariantFragment.kt b/app/src/main/java/com/hover/stax/onboarding/signInVariant/SignInVariantFragment.kt
index 3c77a3a54..4ecdfc8c8 100644
--- a/app/src/main/java/com/hover/stax/onboarding/signInVariant/SignInVariantFragment.kt
+++ b/app/src/main/java/com/hover/stax/onboarding/signInVariant/SignInVariantFragment.kt
@@ -10,7 +10,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.activity.OnBackPressedCallback
 import androidx.core.content.ContextCompat
-import androidx.core.os.bundleOf
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
@@ -19,7 +18,6 @@ import com.google.android.material.progressindicator.LinearProgressIndicator
 import com.hover.stax.R
 import com.hover.stax.databinding.FragmentSigninVariantBinding
 import com.hover.stax.onboarding.OnBoardingActivity
-import com.hover.stax.onboarding.welcome.WelcomeFragment
 import com.hover.stax.utils.AnalyticsUtil
 import com.hover.stax.utils.NavUtil
 import timber.log.Timber
diff --git a/app/src/main/java/com/hover/stax/paybill/PaybillActionsAdapter.kt b/app/src/main/java/com/hover/stax/paybill/PaybillActionsAdapter.kt
index b13965bd6..3b3c6cea0 100644
--- a/app/src/main/java/com/hover/stax/paybill/PaybillActionsAdapter.kt
+++ b/app/src/main/java/com/hover/stax/paybill/PaybillActionsAdapter.kt
@@ -7,6 +7,7 @@ import com.hover.sdk.actions.HoverAction
 import com.hover.stax.R
 import com.hover.stax.databinding.ItemPaybillActionBinding
 import com.hover.stax.utils.UIHelper
+import com.hover.stax.utils.UIHelper.loadImage
 
 class PaybillActionsAdapter(private val paybillActions: List<HoverAction>, private val clickListener: PaybillActionsClickListener)
     : RecyclerView.Adapter<PaybillActionsAdapter.ActionsViewHolder>() {
@@ -32,7 +33,7 @@ class PaybillActionsAdapter(private val paybillActions: List<HoverAction>, priva
 
             binding.root.setOnClickListener { clickListener.onSelectPaybill(action) }
 
-            UIHelper.loadImage(binding.root.context, binding.billIcon.context.getString(R.string.root_url).plus(action.to_institution_logo), binding.billIcon)
+            binding.billIcon.loadImage(binding.root.context, binding.billIcon.context.getString(R.string.root_url).plus(action.to_institution_logo))
         }
     }
 
diff --git a/app/src/main/java/com/hover/stax/paybill/PaybillAdapter.kt b/app/src/main/java/com/hover/stax/paybill/PaybillAdapter.kt
index 0beaf189b..ed3f96ed1 100644
--- a/app/src/main/java/com/hover/stax/paybill/PaybillAdapter.kt
+++ b/app/src/main/java/com/hover/stax/paybill/PaybillAdapter.kt
@@ -9,6 +9,7 @@ import com.hover.stax.R
 import com.hover.stax.databinding.ItemPaybillSavedBinding
 import com.hover.stax.utils.GlideApp
 import com.hover.stax.utils.UIHelper
+import com.hover.stax.utils.UIHelper.loadImage
 
 class PaybillAdapter(private val paybills: List<Paybill>, private val clickListener: ClickListener) : RecyclerView.Adapter<PaybillAdapter.PaybillViewHolder>() {
 
@@ -38,7 +39,7 @@ class PaybillAdapter(private val paybills: List<Paybill>, private val clickListe
                 binding.iconLayout.visibility = View.GONE
                 binding.billLogo.visibility = View.VISIBLE
 
-                UIHelper.loadImage(binding.root.context, paybill.logoUrl, binding.billLogo)
+                binding.billLogo.loadImage(binding.root.context, paybill.logoUrl)
             }
 
             binding.root.setOnClickListener { clickListener.onSelectPaybill(paybill) }
diff --git a/app/src/main/java/com/hover/stax/paybill/PaybillListFragment.kt b/app/src/main/java/com/hover/stax/paybill/PaybillListFragment.kt
index 1bd90f3e6..96355b887 100644
--- a/app/src/main/java/com/hover/stax/paybill/PaybillListFragment.kt
+++ b/app/src/main/java/com/hover/stax/paybill/PaybillListFragment.kt
@@ -33,6 +33,7 @@ class PaybillListFragment : Fragment(), PaybillAdapter.ClickListener, PaybillAct
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
         AnalyticsUtil.logAnalyticsEvent(getString(R.string.visit_screen, getString(R.string.visit_paybill_list)), requireActivity())
 
         binding.contentLayout.setOnClickIcon { NavUtil.navigate(findNavController(), PaybillListFragmentDirections.actionPaybillListFragmentToPaybillFragment(false)) }
diff --git a/app/src/main/java/com/hover/stax/paybill/PaybillNumberDialog.kt b/app/src/main/java/com/hover/stax/paybill/PaybillNumberDialog.kt
index 28568be1d..59ae2966d 100644
--- a/app/src/main/java/com/hover/stax/paybill/PaybillNumberDialog.kt
+++ b/app/src/main/java/com/hover/stax/paybill/PaybillNumberDialog.kt
@@ -7,7 +7,6 @@ import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
 import androidx.navigation.fragment.findNavController
 import com.hover.stax.R
diff --git a/app/src/main/java/com/hover/stax/permissions/ManagePermissionsFragment.kt b/app/src/main/java/com/hover/stax/permissions/ManagePermissionsFragment.kt
index aa6f5695a..0297c9b8e 100644
--- a/app/src/main/java/com/hover/stax/permissions/ManagePermissionsFragment.kt
+++ b/app/src/main/java/com/hover/stax/permissions/ManagePermissionsFragment.kt
@@ -1,6 +1,7 @@
 package com.hover.stax.permissions
 
 import android.Manifest
+import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
@@ -104,7 +105,13 @@ class ManagePermissionsFragment : Fragment() {
 
     private val displayPermCheckedChangeListener = CompoundButton.OnCheckedChangeListener { _, _ -> ph.requestOverlayPerm() }
 
-    private val accessPermCheckedChangeListener = CompoundButton.OnCheckedChangeListener { _, _ -> ph.requestAccessPerm() }
+    private val accessPermCheckedChangeListener = CompoundButton.OnCheckedChangeListener { _, _ -> goToAccessibility(requireContext()) }
+
+    private fun goToAccessibility(c: Context) {
+        val intent = Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        c.startActivity(intent)
+    }
 
     private fun shouldOpenSettings(permissions: List<String>): Boolean {
         return grantResults.contains(ContextCompat.checkSelfPermission(requireActivity(), permissions[0])) ||
diff --git a/app/src/main/java/com/hover/stax/permissions/PermissionsActivity.kt b/app/src/main/java/com/hover/stax/permissions/PermissionsActivity.kt
index 50e0af11e..028ceaaf8 100644
--- a/app/src/main/java/com/hover/stax/permissions/PermissionsActivity.kt
+++ b/app/src/main/java/com/hover/stax/permissions/PermissionsActivity.kt
@@ -1,12 +1,10 @@
 package com.hover.stax.permissions
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import com.hover.stax.R
-import com.hover.sdk.permissions.PermissionHelper
-import android.app.Activity
-import com.hover.stax.permissions.PermissionsFragment
+import androidx.appcompat.app.AppCompatActivity
 import com.hover.sdk.actions.HoverAction
+import com.hover.sdk.permissions.PermissionHelper
+import com.hover.stax.R
 import timber.log.Timber
 
 class PermissionsActivity : AppCompatActivity() {
diff --git a/app/src/main/java/com/hover/stax/requests/NewRequestFragment.kt b/app/src/main/java/com/hover/stax/requests/NewRequestFragment.kt
index bd686ed11..a09412c3d 100644
--- a/app/src/main/java/com/hover/stax/requests/NewRequestFragment.kt
+++ b/app/src/main/java/com/hover/stax/requests/NewRequestFragment.kt
@@ -20,7 +20,6 @@ import com.hover.stax.home.MainActivity
 import com.hover.stax.notifications.PushNotificationTopicsInterface
 import com.hover.stax.transfers.AbstractFormFragment
 import com.hover.stax.utils.AnalyticsUtil
-import com.hover.stax.utils.Constants
 import com.hover.stax.utils.UIHelper
 import com.hover.stax.utils.Utils
 import com.hover.stax.views.*
diff --git a/app/src/main/java/com/hover/stax/requests/NewRequestViewModel.kt b/app/src/main/java/com/hover/stax/requests/NewRequestViewModel.kt
index 6e3549259..22b2c52e2 100644
--- a/app/src/main/java/com/hover/stax/requests/NewRequestViewModel.kt
+++ b/app/src/main/java/com/hover/stax/requests/NewRequestViewModel.kt
@@ -93,23 +93,22 @@ class NewRequestViewModel(application: Application, databaseRepo: DatabaseRepo)
         }
     }
 
-    fun createRequest() {
+    fun createRequest() = viewModelScope.launch(Dispatchers.IO) {
         repo.update(activeChannel.value)
         saveContacts()
 
-
-
-
         val request = Request(amount.value, note.value, requesterNumber.value, activeChannel.value!!.institutionId)
-        formulatedRequest.value = request
+        formulatedRequest.postValue(request)
     }
 
     fun saveRequest() {
         if (formulatedRequest.value != null) {
-            val request = Request(formulatedRequest.value!!, requestee.value, application)
-            repo.insert(request)
+            viewModelScope.launch(Dispatchers.IO) {
+                val request = Request(formulatedRequest.value!!, requestee.value, application)
+                repo.insert(request)
 
-            finalRequests.value = listOf(request)
+                finalRequests.postValue(listOf(request))
+            }
         }
     }
 
diff --git a/app/src/main/java/com/hover/stax/requests/Request.kt b/app/src/main/java/com/hover/stax/requests/Request.kt
index da8597a84..b1345ab22 100644
--- a/app/src/main/java/com/hover/stax/requests/Request.kt
+++ b/app/src/main/java/com/hover/stax/requests/Request.kt
@@ -5,6 +5,7 @@ import android.content.Context
 import android.text.TextUtils
 import androidx.room.ColumnInfo
 import androidx.room.Entity
+import androidx.room.Ignore
 import androidx.room.PrimaryKey
 import com.hover.stax.R
 import com.hover.stax.channels.Channel
@@ -50,6 +51,8 @@ class Request {
     var date_sent: Long = 0
 
     constructor()
+
+    @Ignore
     constructor(amount: String?, note: String?, requester_number: String? ,  requester_institution_id:Int ) {
         this.amount = amount
         this.note = note
@@ -58,6 +61,7 @@ class Request {
         date_sent = now()
     }
 
+    @Ignore
     constructor(r: Request, requestee: StaxContact?, c: Context) {
         amount = r.amount
         note = r.note
@@ -68,6 +72,7 @@ class Request {
         description = getDescription(requestee, c)
     }
 
+    @Ignore
     constructor(paymentLink: String) {
         Timber.v("Creating request from link: %s", paymentLink)
         val splitString = paymentLink.split(PAYMENT_LINK_SEPERATOR).toTypedArray()
diff --git a/app/src/main/java/com/hover/stax/settings/SettingsFragment.kt b/app/src/main/java/com/hover/stax/settings/SettingsFragment.kt
index 4956f0e1a..e326a94cd 100644
--- a/app/src/main/java/com/hover/stax/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/hover/stax/settings/SettingsFragment.kt
@@ -23,7 +23,6 @@ import com.hover.stax.utils.*
 import com.hover.stax.views.StaxDialog
 import org.koin.androidx.viewmodel.ext.android.getViewModel
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
-import timber.log.Timber
 
 
 class SettingsFragment : Fragment() {
@@ -48,6 +47,7 @@ class SettingsFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
         AnalyticsUtil.logAnalyticsEvent(getString(R.string.visit_screen, getString(R.string.visit_security)), requireActivity())
 
         setUpShare()
diff --git a/app/src/main/java/com/hover/stax/transactions/MessagesAdapter.kt b/app/src/main/java/com/hover/stax/transactions/MessagesAdapter.kt
index a20d2578f..04c214edd 100644
--- a/app/src/main/java/com/hover/stax/transactions/MessagesAdapter.kt
+++ b/app/src/main/java/com/hover/stax/transactions/MessagesAdapter.kt
@@ -1,16 +1,16 @@
 package com.hover.stax.transactions
 
 import android.graphics.Paint
-import com.hover.stax.utils.Utils.dial
-import com.hover.stax.transactions.UssdCallResponse
-import androidx.recyclerview.widget.RecyclerView
-import com.hover.stax.transactions.MessagesAdapter.TransactionMessageViewHolder
-import android.view.ViewGroup
 import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
 import com.hover.stax.R
 import com.hover.stax.databinding.TransactionMessagesItemsBinding
+import com.hover.stax.transactions.MessagesAdapter.TransactionMessageViewHolder
+import com.hover.stax.utils.Utils.dial
 
 class MessagesAdapter internal constructor(private val messagesList: List<UssdCallResponse>?,
                                            private val timeStarted: String,
@@ -74,7 +74,7 @@ class MessagesAdapter internal constructor(private val messagesList: List<UssdCa
 	}
 
 	private fun styleAsLink(tv: TextView, shortcode: String) {
-		tv.setTextColor(tv.context.resources.getColor(R.color.brightBlue))
+		tv.setTextColor(ContextCompat.getColor(tv.context, R.color.brightBlue))
 		tv.paintFlags = Paint.UNDERLINE_TEXT_FLAG
 		tv.setOnClickListener { v: View -> dial(shortcode, v.context) }
 	}
diff --git a/app/src/main/java/com/hover/stax/transactions/StaxTransaction.java b/app/src/main/java/com/hover/stax/transactions/StaxTransaction.java
index d834d3e4e..b7566ea77 100644
--- a/app/src/main/java/com/hover/stax/transactions/StaxTransaction.java
+++ b/app/src/main/java/com/hover/stax/transactions/StaxTransaction.java
@@ -199,9 +199,18 @@ public String generateLongDescription(HoverAction action, StaxContact contact, C
     public TransactionStatus getFullStatus() {
         return new TransactionStatus(this);
     }
-    public Boolean  isFailed(){ return status.equals(Transaction.FAILED); }
-    public Boolean isSuccessful() {return status.equals(Transaction.SUCCEEDED);}
-    public Boolean isBalanceType() {return transaction_type.equals(HoverAction.BALANCE);}
+
+    public Boolean isFailed() {
+        return status.equals(Transaction.FAILED);
+    }
+
+    public Boolean isSuccessful() {
+        return status.equals(Transaction.SUCCEEDED);
+    }
+
+    public Boolean isBalanceType() {
+        return transaction_type.equals(HoverAction.BALANCE);
+    }
 
     public boolean isRecorded() {
         return environment == HoverParameters.MANUAL_ENV;
@@ -219,10 +228,9 @@ else if (isRecorded())
     }
 
     public String getDisplayBalance() {
-        if(!balance.isEmpty()) {
+        if (!balance.isEmpty()) {
             return Utils.formatAmount(balance);
-        }
-        else return balance;
+        } else return balance;
     }
 
     @NotNull
diff --git a/app/src/main/java/com/hover/stax/transactions/TransactionDetailsFragment.kt b/app/src/main/java/com/hover/stax/transactions/TransactionDetailsFragment.kt
index 1edfbafbb..db1429a1b 100644
--- a/app/src/main/java/com/hover/stax/transactions/TransactionDetailsFragment.kt
+++ b/app/src/main/java/com/hover/stax/transactions/TransactionDetailsFragment.kt
@@ -1,8 +1,6 @@
 package com.hover.stax.transactions
 
 import android.annotation.SuppressLint
-import android.graphics.Bitmap
-import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
@@ -10,14 +8,16 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
+import android.view.animation.AnimationUtils
+import android.widget.Button
+import android.widget.RelativeLayout
 import android.widget.TextView
-import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
-import androidx.core.os.bundleOf
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.hover.sdk.actions.HoverAction
 import com.hover.sdk.api.Hover
 import com.hover.sdk.transactions.Transaction
@@ -30,14 +30,11 @@ import com.hover.stax.utils.AnalyticsUtil.logAnalyticsEvent
 import com.hover.stax.utils.AnalyticsUtil.logErrorAndReportToFirebase
 import com.hover.stax.utils.DateUtils
 import com.hover.stax.utils.NavUtil
-import com.hover.stax.utils.UIHelper
+import com.hover.stax.utils.UIHelper.loadImage
 import com.hover.stax.utils.Utils
-import com.squareup.picasso.Picasso
-import com.squareup.picasso.Target
 import org.json.JSONException
 import org.json.JSONObject
 import org.koin.androidx.viewmodel.ext.android.viewModel
-import timber.log.Timber
 
 
 class TransactionDetailsFragment : Fragment() {
@@ -50,6 +47,7 @@ class TransactionDetailsFragment : Fragment() {
     private val args: TransactionDetailsFragmentArgs by navArgs()
 
     private lateinit var childFragManager: FragmentManager
+    private lateinit var bottomSheetBehavior: BottomSheetBehavior<RelativeLayout>
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         viewModel.setTransaction(args.uuid)
@@ -79,21 +77,19 @@ class TransactionDetailsFragment : Fragment() {
         with(binding.infoCard.detailsServiceId.content) { setOnClickListener { Utils.copyToClipboard(this.text.toString(), requireContext()) } }
     }
 
-    private fun showUSSDLog() {
-        val log = USSDLogBottomSheetFragment.newInstance(args.uuid)
-        log.show(childFragManager, USSDLogBottomSheetFragment::class.java.simpleName)
-    }
+    private fun showUSSDLog() = USSDLogBottomSheetFragment.newInstance(args.uuid).show(childFragManager, USSDLogBottomSheetFragment::class.java.simpleName)
 
     private fun startObservers() = with(viewModel) {
         transaction.observe(viewLifecycleOwner) { showTransaction(it) }
         action.observe(viewLifecycleOwner) { it?.let { showActionDetails(it) } }
         contact.observe(viewLifecycleOwner) { updateRecipient(it) }
+        bonusAmt.observe(viewLifecycleOwner) { showBonusAmount(it) }
     }
 
-    private fun setupContactSupportButton(id: String, contactSupportTextView: TextView) {
-        contactSupportTextView.setText(R.string.email_support)
-        contactSupportTextView.setOnClickListener {
-            resetTryAgainCounter(id)
+    private fun setupContactSupportButton(id: String, contactSupportTextView: TextView) = contactSupportTextView.apply {
+        text = getString(R.string.email_support)
+        setOnClickListener {
+            resetRetryCounter(id)
             val deviceId = Hover.getDeviceId(requireContext())
             val subject = "Stax Transaction failure - support id- {${deviceId}}"
             Utils.openEmail(subject, requireActivity())
@@ -101,11 +97,11 @@ class TransactionDetailsFragment : Fragment() {
     }
 
     private fun updateRetryCounter(id: String) {
-        val currentCount: Int = if (retryCounter[id] != null) retryCounter[id]!! else 0
+        val currentCount: Int = retryCounter[id] ?: 0
         retryCounter[id] = currentCount + 1
     }
 
-    private fun resetTryAgainCounter(id: String) {
+    private fun resetRetryCounter(id: String) {
         retryCounter[id] = 0
     }
 
@@ -121,23 +117,18 @@ class TransactionDetailsFragment : Fragment() {
                     setupContactSupportButton(transaction.action_id, button)
                 else
                     retryTransactionClicked(transaction, button)
-            } else binding.secondaryStatus.transactionRetryButtonLayoutId.visibility = GONE
+            } else binding.secondaryStatus.btnRetryTransaction.visibility = GONE
+
             updateDetails(transaction)
+            showShareExcitement(!transaction.isRecorded && transaction.isSuccessful)
         }
     }
 
-    private fun showButtonToClick(): TextView {
-        val transactionButtonsLayout = binding.secondaryStatus.transactionRetryButtonLayoutId
-        val retryButton = binding.secondaryStatus.btnRetryTransaction
-        transactionButtonsLayout.visibility = VISIBLE
-        return retryButton
-    }
+    private fun showButtonToClick(): Button = binding.secondaryStatus.btnRetryTransaction.also { it.visibility = VISIBLE }
 
     private fun setupRetryBountyButton() {
-        val bountyButtonsLayout = binding.secondaryStatus.transactionRetryButtonLayoutId
-        val retryButton = binding.secondaryStatus.btnRetryTransaction
-        bountyButtonsLayout.visibility = VISIBLE
-        retryButton.setOnClickListener { retryBountyClicked() }
+        val retryBtn = showButtonToClick()
+        retryBtn.setOnClickListener { retryBountyClicked() }
     }
 
     private fun retryBountyClicked() {
@@ -150,7 +141,12 @@ class TransactionDetailsFragment : Fragment() {
         retryButton.setOnClickListener {
             updateRetryCounter(transaction.action_id)
             if (transaction.isBalanceType) (requireActivity() as MainActivity).reBuildHoverSession(transaction)
-            else (requireActivity() as MainActivity).navigateTransferAutoFill(transaction.transaction_type, transaction.uuid)
+            else
+                NavUtil.navigate(findNavController(),
+                    TransactionDetailsFragmentDirections.actionTransactionDetailsFragmentToNavigationTransfer(transaction.transaction_type).also {
+                        it.transactionUUID = transaction.uuid
+                        it.channelId = transaction.channel_id
+                    })
         }
     }
 
@@ -158,12 +154,31 @@ class TransactionDetailsFragment : Fragment() {
         return !transaction.isBalanceType && !transaction.balance.isNullOrEmpty() && transaction.isSuccessful
     }
 
+    private fun showShareExcitement(isTransactionSuccessful: Boolean) {
+        bottomSheetBehavior = BottomSheetBehavior.from(binding.shareLayout.bottomSheet)
+        val shouldShow = args.isNewTransaction && isTransactionSuccessful
+        setBottomSheetVisibility(shouldShow)
+    }
+
+    private fun setBottomSheetVisibility(isVisible: Boolean) {
+        var updatedState = BottomSheetBehavior.STATE_HIDDEN
+
+        if(isVisible) {
+            updatedState = BottomSheetBehavior.STATE_EXPANDED
+            val animation = AnimationUtils.loadAnimation(requireContext(), R.anim.slide_down)
+            binding.shareLayout.bottomSheet.visibility = VISIBLE
+            binding.shareLayout.bottomSheet.animation = animation
+            binding.shareLayout.shareBtn.setOnClickListener { Utils.shareStax(requireActivity()) }
+        }
+        bottomSheetBehavior.state = updatedState
+    }
+
     @SuppressLint("SetTextI18n")
     private fun updateDetails(transaction: StaxTransaction) {
         val title = when (transaction.transaction_type) {
             HoverAction.P2P -> getString(R.string.send_money)
             HoverAction.AIRTIME -> getString(R.string.buy_airtime)
-            else -> transaction.transaction_type
+            else -> transaction.transaction_type.replace("_", " ")
         }
         binding.transactionDetailsCard.setTitle(title)
 
@@ -247,7 +262,7 @@ class TransactionDetailsFragment : Fragment() {
                     movementMethod = LinkMovementMethod.getInstance()
                 }
                 if (transaction.isFailed) action?.let {
-                    UIHelper.loadImage(this@TransactionDetailsFragment, getString(R.string.root_url).plus(it.from_institution_logo), binding.secondaryStatus.statusIcon)
+                    binding.secondaryStatus.statusIcon.loadImage(this@TransactionDetailsFragment, getString(R.string.root_url).plus(it.from_institution_logo))
                 }
                 else binding.secondaryStatus.statusIcon.visibility = GONE
             }
@@ -260,6 +275,17 @@ class TransactionDetailsFragment : Fragment() {
         } else binding.infoCard.detailsRecipient.setTitle(getString(R.string.self_choice))
     }
 
+    private fun showBonusAmount(amount: Int) = with(binding.infoCard) {
+        val txn = viewModel.transaction.value
+        
+        if(amount > 0 && (txn != null && txn.isSuccessful)){
+            bonusRow.visibility = VISIBLE
+            bonusAmount.text = amount.toString()
+        } else {
+            bonusRow.visibility = GONE
+        }
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
diff --git a/app/src/main/java/com/hover/stax/transactions/TransactionDetailsViewModel.kt b/app/src/main/java/com/hover/stax/transactions/TransactionDetailsViewModel.kt
index 54c79a879..c39e09f39 100644
--- a/app/src/main/java/com/hover/stax/transactions/TransactionDetailsViewModel.kt
+++ b/app/src/main/java/com/hover/stax/transactions/TransactionDetailsViewModel.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.*
 import com.hover.sdk.actions.HoverAction
 import com.hover.sdk.api.Hover
 import com.hover.sdk.api.Hover.getSMSMessageByUUID
+import com.hover.stax.bonus.BonusRepo
 import com.hover.stax.contacts.StaxContact
 import com.hover.stax.database.DatabaseRepo
 import kotlinx.coroutines.Dispatchers
@@ -12,14 +13,16 @@ import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import org.json.JSONArray
 import timber.log.Timber
+import kotlin.math.floor
 
-class TransactionDetailsViewModel(val repo: DatabaseRepo, val application: Application) : ViewModel() {
+class TransactionDetailsViewModel(val repo: DatabaseRepo, val application: Application, val bonusRepo: BonusRepo) : ViewModel() {
 
     val transaction = MutableLiveData<StaxTransaction>()
     val messages = MediatorLiveData<List<UssdCallResponse>>()
     var action: LiveData<HoverAction> = MutableLiveData()
     var contact: LiveData<StaxContact> = MutableLiveData()
     var sms: LiveData<List<UssdCallResponse>> = MutableLiveData()
+    var bonusAmt = MutableLiveData(0)
 
     init {
         action = Transformations.switchMap(transaction) { getLiveAction(it) }
@@ -57,18 +60,32 @@ class TransactionDetailsViewModel(val repo: DatabaseRepo, val application: Appli
         messages.value = UssdCallResponse.generateConvo(Hover.getTransaction(txn.uuid, application), a)
     }
 
-    private fun loadSms(txn: StaxTransaction): List<UssdCallResponse>? {
+    private fun loadSms(txn: StaxTransaction): List<UssdCallResponse> {
+        getBonusAmount(txn)
+
         val t = Hover.getTransaction(txn.uuid, application)
         return generateSmsConvo(if (t.smsHits != null && t.smsHits.length() > 0) t.smsHits else t.smsMisses)
     }
 
     private fun generateSmsConvo(smsArr: JSONArray): ArrayList<UssdCallResponse> {
         val smses = ArrayList<UssdCallResponse>()
+
         for (i in 0 until smsArr.length()) {
             val sms = getSMSMessageByUUID(smsArr.optString(i), application)
             Timber.e(sms.uuid)
             smses.add(UssdCallResponse(null, sms.msg))
         }
+
         return smses
     }
+
+    fun getBonusAmount(staxTransaction: StaxTransaction) = viewModelScope.launch(Dispatchers.IO) {
+        val bonus = bonusRepo.getBonusByPurchaseChannel(staxTransaction.channel_id)
+
+        if (bonus != null) {
+            val bonusAmount = floor(bonus.bonusPercent.times(staxTransaction.amount))
+            bonusAmt.postValue(bonusAmount.toInt())
+        } else
+            bonusAmt.postValue(0)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/hover/stax/transactions/TransactionHistoryAdapter.java b/app/src/main/java/com/hover/stax/transactions/TransactionHistoryAdapter.java
index b43929195..58ad5329b 100644
--- a/app/src/main/java/com/hover/stax/transactions/TransactionHistoryAdapter.java
+++ b/app/src/main/java/com/hover/stax/transactions/TransactionHistoryAdapter.java
@@ -1,6 +1,5 @@
 package com.hover.stax.transactions;
 
-import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/hover/stax/transactions/TransactionStatus.kt b/app/src/main/java/com/hover/stax/transactions/TransactionStatus.kt
index acb4cfb4d..32d0b1767 100644
--- a/app/src/main/java/com/hover/stax/transactions/TransactionStatus.kt
+++ b/app/src/main/java/com/hover/stax/transactions/TransactionStatus.kt
@@ -1,7 +1,6 @@
 package com.hover.stax.transactions
 
 import android.content.Context
-import androidx.compose.ui.text.capitalize
 import com.hover.sdk.actions.HoverAction
 import com.hover.sdk.transactions.Transaction
 import com.hover.stax.R
@@ -10,7 +9,7 @@ class TransactionStatus(val transaction: StaxTransaction) {
 
     fun getIcon(): Int {
         return when (transaction.status) {
-            Transaction.FAILED -> R.drawable.ic_info_red
+            Transaction.FAILED -> R.drawable.ic_error
             Transaction.PENDING -> R.drawable.ic_warning
             else -> R.drawable.ic_success
         }
@@ -54,7 +53,7 @@ class TransactionStatus(val transaction: StaxTransaction) {
             HoverAction.C2B -> c.getString(R.string.display_bill_payment)
             HoverAction.RECEIVE -> c.getString(R.string.display_money_received)
             else -> "Other"
-        }.capitalize()
+        }.replaceFirstChar { it.uppercase() }
     }
 
 
diff --git a/app/src/main/java/com/hover/stax/transactions/USSDLogBottomSheetFragment.kt b/app/src/main/java/com/hover/stax/transactions/USSDLogBottomSheetFragment.kt
index d87b7c174..6a466112a 100644
--- a/app/src/main/java/com/hover/stax/transactions/USSDLogBottomSheetFragment.kt
+++ b/app/src/main/java/com/hover/stax/transactions/USSDLogBottomSheetFragment.kt
@@ -31,6 +31,7 @@ class USSDLogBottomSheetFragment: BottomSheetDialogFragment() {
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
+
 		binding.closeButton.setOnClickListener { this.dismiss() }
 		setCardTitle()
 		createUSSDMessagesRecyclerView()
diff --git a/app/src/main/java/com/hover/stax/transactions/UssdCallResponse.java b/app/src/main/java/com/hover/stax/transactions/UssdCallResponse.java
index 15e434799..18de11ea1 100644
--- a/app/src/main/java/com/hover/stax/transactions/UssdCallResponse.java
+++ b/app/src/main/java/com/hover/stax/transactions/UssdCallResponse.java
@@ -2,7 +2,6 @@
 
 import com.hover.sdk.actions.HoverAction;
 import com.hover.sdk.transactions.Transaction;
-import com.hover.stax.utils.DateUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/hover/stax/transfers/AbstractFormFragment.kt b/app/src/main/java/com/hover/stax/transfers/AbstractFormFragment.kt
index 5ea1ac1eb..7e72005fb 100644
--- a/app/src/main/java/com/hover/stax/transfers/AbstractFormFragment.kt
+++ b/app/src/main/java/com/hover/stax/transfers/AbstractFormFragment.kt
@@ -32,6 +32,7 @@ import com.hover.stax.views.StaxCardView
 import com.hover.stax.views.StaxDialog
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import timber.log.Timber
 
@@ -140,12 +141,14 @@ abstract class AbstractFormFragment : Fragment(), AccountDropdown.AccountFetchLi
     }
 
     override fun fetchAccounts(account: Account) {
-        dialog = StaxDialog(requireActivity())
-            .setDialogTitle(getString(R.string.incomplete_account_setup_header))
-            .setDialogMessage(getString(R.string.incomplete_account_setup_desc, account.alias))
-            .setPosButton(R.string.check_balance_title) { runBalanceCheck(account.channelId) }
-            .setNegButton(R.string.btn_cancel, null)
-        dialog!!.showIt()
+        if(dialog == null) {
+            dialog = StaxDialog(requireActivity())
+                .setDialogTitle(getString(R.string.incomplete_account_setup_header))
+                .setDialogMessage(getString(R.string.incomplete_account_setup_desc, account.alias))
+                .setPosButton(R.string.check_balance_title) { runBalanceCheck(account.channelId) }
+                .setNegButton(R.string.btn_cancel, null)
+            dialog!!.showIt()
+        }
     }
 
     private fun runBalanceCheck(channelId: Int) = lifecycleScope.launch(Dispatchers.IO) {
@@ -155,8 +158,9 @@ abstract class AbstractFormFragment : Fragment(), AccountDropdown.AccountFetchLi
 
             if (action != null)
                 (activity as? MainActivity)?.makeCall(action, channel)
-            else
+            else withContext(Dispatchers.Main) {
                 UIHelper.flashMessage(requireActivity(), getString(R.string.action_run_error))
+            }
         }
     }
 
diff --git a/app/src/main/java/com/hover/stax/transfers/NonStandardSummaryAdapter.kt b/app/src/main/java/com/hover/stax/transfers/NonStandardSummaryAdapter.kt
index 4cf8e83f1..ac0184cb9 100644
--- a/app/src/main/java/com/hover/stax/transfers/NonStandardSummaryAdapter.kt
+++ b/app/src/main/java/com/hover/stax/transfers/NonStandardSummaryAdapter.kt
@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.hover.stax.databinding.SummarycardNontemplateItemsBinding
-import com.hover.stax.utils.Utils
 import com.hover.stax.utils.splitCamelCase
 
 class NonStandardSummaryAdapter(private var items: LinkedHashMap<String, String>) : RecyclerView.Adapter<NonStandardSummaryAdapter.ViewHolder>() {
diff --git a/app/src/main/java/com/hover/stax/transfers/NonStandardVariableAdapter.kt b/app/src/main/java/com/hover/stax/transfers/NonStandardVariableAdapter.kt
index 526175811..255775a73 100644
--- a/app/src/main/java/com/hover/stax/transfers/NonStandardVariableAdapter.kt
+++ b/app/src/main/java/com/hover/stax/transfers/NonStandardVariableAdapter.kt
@@ -7,10 +7,8 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.hover.stax.R
 import com.hover.stax.databinding.InputItemBinding
-import com.hover.stax.utils.Utils
 import com.hover.stax.utils.splitCamelCase
 import com.hover.stax.views.AbstractStatefulInput
-import timber.log.Timber
 
 class NonStandardVariableAdapter(private var variables: LinkedHashMap<String, String>, private val editTextListener: NonStandardVariableInputListener, private val recyclerView: RecyclerView) :
     RecyclerView.Adapter<NonStandardVariableAdapter.ViewHolder>() {
diff --git a/app/src/main/java/com/hover/stax/transfers/TransferFragment.kt b/app/src/main/java/com/hover/stax/transfers/TransferFragment.kt
index f9c6e52d4..2a641ec54 100644
--- a/app/src/main/java/com/hover/stax/transfers/TransferFragment.kt
+++ b/app/src/main/java/com/hover/stax/transfers/TransferFragment.kt
@@ -3,27 +3,34 @@ package com.hover.stax.transfers
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
+import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
+import androidx.lifecycle.Observer
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.hover.sdk.actions.HoverAction
 import com.hover.stax.R
+import com.hover.stax.accounts.Account
 import com.hover.stax.actions.ActionSelect
 import com.hover.stax.actions.ActionSelectViewModel
+import com.hover.stax.bonus.Bonus
+import com.hover.stax.bonus.BonusViewModel
 import com.hover.stax.contacts.ContactInput
 import com.hover.stax.contacts.StaxContact
 import com.hover.stax.databinding.FragmentTransferBinding
 import com.hover.stax.home.MainActivity
 import com.hover.stax.utils.AnalyticsUtil
-import com.hover.stax.utils.Constants
 import com.hover.stax.utils.UIHelper
 import com.hover.stax.utils.Utils
 import com.hover.stax.views.AbstractStatefulInput
 import com.hover.stax.views.Stax2LineItem
 import com.hover.stax.views.StaxTextInputLayout
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.getSharedViewModel
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import timber.log.Timber
@@ -32,6 +39,7 @@ import timber.log.Timber
 class TransferFragment : AbstractFormFragment(), ActionSelect.HighlightListener, NonStandardVariableAdapter.NonStandardVariableInputListener {
 
     private val actionSelectViewModel: ActionSelectViewModel by sharedViewModel()
+    private val bonusViewModel: BonusViewModel by sharedViewModel()
     private lateinit var transferViewModel: TransferViewModel
 
     private val args by navArgs<TransferFragmentArgs>()
@@ -44,7 +52,6 @@ class TransferFragment : AbstractFormFragment(), ActionSelect.HighlightListener,
     private var _binding: FragmentTransferBinding? = null
     private val binding get() = _binding!!
 
-    private lateinit var nonStandardSummaryAdapter: NonStandardSummaryAdapter
     private var nonStandardVariableAdapter: NonStandardVariableAdapter? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
@@ -54,7 +61,6 @@ class TransferFragment : AbstractFormFragment(), ActionSelect.HighlightListener,
         setTransactionType(args.transactionType)
 
         args.transactionUUID?.let {
-            Timber.e("TxnUUID is $it. Setting autofill")
             transferViewModel.autoFill(it)
         }
 
@@ -76,8 +82,10 @@ class TransferFragment : AbstractFormFragment(), ActionSelect.HighlightListener,
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        transferViewModel.reset() //TODO remove if values are removed
+
+        transferViewModel.reset()
         init(binding.root)
+
         startObservers(binding.root)
         startListeners()
     }
@@ -125,6 +133,7 @@ class TransferFragment : AbstractFormFragment(), ActionSelect.HighlightListener,
         observeRecentContacts()
         observeNonStandardVariables()
         observeAutoFillToInstitution()
+
         with(transferViewModel) {
             contact.observe(viewLifecycleOwner) { recipientValue.setContact(it) }
             request.observe(viewLifecycleOwner) {
@@ -150,6 +159,8 @@ class TransferFragment : AbstractFormFragment(), ActionSelect.HighlightListener,
                 binding.summaryCard.accountValue.setTitle(it.toString())
             }
             recipientInstitutionSelect.visibility = if (channel != null) View.VISIBLE else View.GONE
+
+            checkForBonus()
         }
     }
 
@@ -162,13 +173,25 @@ class TransferFragment : AbstractFormFragment(), ActionSelect.HighlightListener,
         }
     }
 
-    private fun observeAccountList() {
-        channelsViewModel.accounts.observe(viewLifecycleOwner) {
+    private fun observeAccountList() = with(channelsViewModel) {
+        accounts.observe(viewLifecycleOwner) {
             if (it.isEmpty())
                 setDropdownTouchListener(TransferFragmentDirections.actionNavigationTransferToAccountsFragment())
 
-            if (args.transactionUUID == null)
+            if (args.channelId != 0) { //to be used with bonus flow. Other uses will require a slight change in this
+                updateAccountDropdown()
+                return@observe
+            }
+
+            if (args.transactionUUID == null) {
                 accountDropdown.setCurrentAccount()
+                return@observe
+            }
+        }
+
+        if(args.transactionType == HoverAction.AIRTIME) {
+            val observer = Observer<Account> { it?.let { setChannel(it) } }
+            activeAccount.observe(viewLifecycleOwner, observer)
         }
     }
 
@@ -311,7 +334,6 @@ class TransferFragment : AbstractFormFragment(), ActionSelect.HighlightListener,
     }
 
     override fun onContactSelected(contact: StaxContact) {
-//        transferViewModel.setEditing(true)
         transferViewModel.setContact(contact)
         contactInput.setSelected(contact)
     }
@@ -321,17 +343,18 @@ class TransferFragment : AbstractFormFragment(), ActionSelect.HighlightListener,
     }
 
     private fun updateNonStandardForEntryList(variables: LinkedHashMap<String, String>) {
-        val recyclerView = binding.editCard.nonStandardVariableRecyclerView
-        nonStandardVariableAdapter = NonStandardVariableAdapter(variables, this, recyclerView)
-        recyclerView.layoutManager = UIHelper.setMainLinearManagers(requireContext())
-        recyclerView.adapter = nonStandardVariableAdapter
+        binding.editCard.nonStandardVariableRecyclerView.also {
+            nonStandardVariableAdapter = NonStandardVariableAdapter(variables, this@TransferFragment, it)
+            it.layoutManager = UIHelper.setMainLinearManagers(requireContext())
+            it.adapter = nonStandardVariableAdapter
+        }
     }
 
     private fun updateNonStandardForSummaryCard(variables: LinkedHashMap<String, String>) {
-        val recyclerView = binding.summaryCard.nonStandardSummaryRecycler
-        recyclerView.layoutManager = UIHelper.setMainLinearManagers(requireContext())
-        nonStandardSummaryAdapter = NonStandardSummaryAdapter(variables)
-        recyclerView.adapter = nonStandardSummaryAdapter
+        binding.summaryCard.nonStandardSummaryRecycler.apply {
+            layoutManager = UIHelper.setMainLinearManagers(requireContext())
+            adapter = NonStandardSummaryAdapter(variables)
+        }
     }
 
     private fun setRecipientHint(action: HoverAction) {
@@ -360,6 +383,76 @@ class TransferFragment : AbstractFormFragment(), ActionSelect.HighlightListener,
         accountDropdown.setState(getString(R.string.channel_request_fieldinfo, data.institutionId.toString()), AbstractStatefulInput.INFO)
     }
 
+    private fun checkForBonus() {
+        if (args.transactionType == HoverAction.AIRTIME) {
+            val bonuses = bonusViewModel.bonuses.value
+            if (!bonuses.isNullOrEmpty())
+                showBonusBanner(bonuses)
+        }
+    }
+
+    private fun showBonusBanner(bonuses: List<Bonus>) = with(binding.bonusLayout) {
+        val channelId = bonuses.first().userChannel
+
+        cardBonus.visibility = View.VISIBLE
+        val bonus = bonuses.first()
+        val usingBonusChannel = channelsViewModel.activeChannel.value?.id == bonus.purchaseChannel
+
+        learnMore.movementMethod = LinkMovementMethod.getInstance()
+
+        if (usingBonusChannel) {
+            title.text = getString(R.string.congratulations)
+            message.text = getString(R.string.valid_account_bonus_msg)
+            cta.visibility = View.GONE
+        } else {
+            title.text = getString(R.string.get_extra_airtime)
+            message.text = getString(R.string.invalid_account_bonus_msg)
+            cta.apply {
+                visibility = View.VISIBLE
+                text = getString(R.string.top_up_with_mpesa)
+                setOnClickListener {
+                    AnalyticsUtil.logAnalyticsEvent(getString(R.string.clicked_bonus_airtime_banner), requireActivity())
+                    channelsViewModel.setActiveChannelAndAccount(bonus.purchaseChannel, channelId)
+                }
+            }
+        }
+    }
+
+    override fun showEdit(isEditing: Boolean) {
+        super.showEdit(isEditing)
+
+        if (!isEditing)
+            binding.bonusLayout.cardBonus.visibility = View.GONE
+        else
+            checkForBonus()
+    }
+
+    /**
+     * Handles instances where the active account is different from the bonus account to be used.
+     * ChannelId is fetched from the bonus object's user channel field.
+     * Channel and respective accounts are fetched before being passed to account dropdown
+     */
+    private fun updateAccountDropdown() = lifecycleScope.launch(Dispatchers.IO) {
+        val bonus = bonusViewModel.getBonusByPurchaseChannel(args.channelId)
+
+        bonus?.let {
+            val channel = channelsViewModel.getChannel(bonus.userChannel)
+            channelsViewModel.setActiveChannelAndAccount(bonus.purchaseChannel, channel!!.id)
+        } ?: run { Timber.e("Bonus cannot be found") }
+    }
+
+    /**
+     * Monitors changes in active account from account dropdown and sets bonus channel
+     */
+    private fun setChannel(account: Account) = lifecycleScope.launch(Dispatchers.IO) {
+        val bonus = bonusViewModel.getBonusByUserChannel(account.channelId)
+
+        if (bonus != null) {
+            val channel = channelsViewModel.getChannel(bonus.purchaseChannel)
+            channelsViewModel.setActiveChannel(channel!!)
+        }
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
 
diff --git a/app/src/main/java/com/hover/stax/transfers/TransferViewModel.kt b/app/src/main/java/com/hover/stax/transfers/TransferViewModel.kt
index 13f7eb95c..4ff899618 100644
--- a/app/src/main/java/com/hover/stax/transfers/TransferViewModel.kt
+++ b/app/src/main/java/com/hover/stax/transfers/TransferViewModel.kt
@@ -46,7 +46,7 @@ class TransferViewModel(application: Application, repo: DatabaseRepo) : Abstract
 
             action?.let {
                 val contact = repo.getContactAsync(transaction.counterparty_id)
-                autoFill(transaction.amount.toString(), contact, AutofillData(action.to_institution_id, transaction.channel_id, transaction.accountId, true))
+                autoFill(transaction.amount.toInt().toString(), contact, AutofillData(action.to_institution_id, transaction.channel_id, transaction.accountId, true))
             }
         }
     }
@@ -58,7 +58,6 @@ class TransferViewModel(application: Application, repo: DatabaseRepo) : Abstract
     }
 
     fun setContact(sc: StaxContact?) = sc?.let {
-        Timber.i("contact is not null when posted")
         contact.postValue(it)
     }
 
@@ -74,10 +73,10 @@ class TransferViewModel(application: Application, repo: DatabaseRepo) : Abstract
     }
 
     fun setRecipientSmartly(contactNum: String?, channel: Channel) {
-        contactNum.let {
+        contactNum?.let {
             viewModelScope.launch(Dispatchers.IO) {
                 try {
-                    val formattedPhone = PhoneHelper.getInternationalNumber(channel.countryAlpha2, contactNum)
+                    val formattedPhone = PhoneHelper.getInternationalNumber(channel.countryAlpha2, it)
                     val sc = repo.getContactByPhone(formattedPhone)
                     sc?.let { contact.postValue(it) }
                 } catch (e: NumberFormatException) {
diff --git a/app/src/main/java/com/hover/stax/ussd_library/LibraryChannelsAdapter.kt b/app/src/main/java/com/hover/stax/ussd_library/LibraryChannelsAdapter.kt
index bc2d73518..b829ed9c3 100644
--- a/app/src/main/java/com/hover/stax/ussd_library/LibraryChannelsAdapter.kt
+++ b/app/src/main/java/com/hover/stax/ussd_library/LibraryChannelsAdapter.kt
@@ -2,13 +2,15 @@ package com.hover.stax.ussd_library
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.hover.stax.R
 import com.hover.stax.channels.Channel
 import com.hover.stax.databinding.LibraryListItemBinding
 import com.hover.stax.utils.Utils
 
-class LibraryChannelsAdapter(private val channelList: List<Channel>) : RecyclerView.Adapter<LibraryChannelsAdapter.ViewHolder>() {
+class LibraryChannelsAdapter : ListAdapter<Channel, LibraryChannelsAdapter.ViewHolder>(diffUtil) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val binding = LibraryListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
@@ -16,11 +18,9 @@ class LibraryChannelsAdapter(private val channelList: List<Channel>) : RecyclerV
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.bindItems(channelList[holder.adapterPosition])
+        holder.bindItems(getItem(holder.adapterPosition))
     }
 
-    override fun getItemCount(): Int = channelList.size
-
     inner class ViewHolder(val binding: LibraryListItemBinding) : RecyclerView.ViewHolder(binding.root) {
 
         fun bindItems(channel: Channel) {
@@ -33,4 +33,16 @@ class LibraryChannelsAdapter(private val channelList: List<Channel>) : RecyclerV
             }
         }
     }
+
+    companion object {
+        private val diffUtil = object: DiffUtil.ItemCallback<Channel>() {
+            override fun areItemsTheSame(oldItem: Channel, newItem: Channel): Boolean {
+                return oldItem.id == newItem.id
+            }
+
+            override fun areContentsTheSame(oldItem: Channel, newItem: Channel): Boolean {
+                return oldItem == newItem
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/hover/stax/ussd_library/LibraryFragment.kt b/app/src/main/java/com/hover/stax/ussd_library/LibraryFragment.kt
index 3288221f5..faa7a15d9 100644
--- a/app/src/main/java/com/hover/stax/ussd_library/LibraryFragment.kt
+++ b/app/src/main/java/com/hover/stax/ussd_library/LibraryFragment.kt
@@ -10,6 +10,7 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
 import com.hover.stax.R
 import com.hover.stax.channels.Channel
 import com.hover.stax.countries.CountryAdapter
@@ -27,6 +28,8 @@ class LibraryFragment : Fragment(), CountryAdapter.SelectListener {
     private var _binding: FragmentLibraryBinding? = null
     private val binding get() = _binding!!
 
+    private val libraryAdapter = LibraryChannelsAdapter()
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         _binding = FragmentLibraryBinding.inflate(inflater, container, false)
 
@@ -39,7 +42,11 @@ class LibraryFragment : Fragment(), CountryAdapter.SelectListener {
 
         binding.countryCard.showProgressIndicator()
         binding.countryDropdown.setListener(this)
-        binding.shortcodes.layoutManager = UIHelper.setMainLinearManagers(requireActivity())
+
+        binding.shortcodes.apply {
+            layoutManager = UIHelper.setMainLinearManagers(requireActivity())
+            adapter = libraryAdapter
+        }
 
         setupEmptyState()
         setSearchInputWatcher()
@@ -47,8 +54,14 @@ class LibraryFragment : Fragment(), CountryAdapter.SelectListener {
     }
 
     private fun setObservers() {
+        val observer = object: Observer<List<Channel>> {
+            override fun onChanged(t: List<Channel>?) {
+                Timber.i("Staged channels loaded ${t?.size}")
+            }
+        }
+
         with(viewModel) {
-            stagedChannels.observe(viewLifecycleOwner) { Timber.i("staged channels loaded")}
+            stagedChannels.observe(viewLifecycleOwner, observer)
             filteredChannels.observe(viewLifecycleOwner) { it?.let { updateList(it) } }
             country.observe(viewLifecycleOwner) { it?.let { binding.countryDropdown.setDropdownValue(it) } }
             allChannels.observe(viewLifecycleOwner) { it?.let { binding.countryDropdown.updateChoices(it, viewModel.country.value) } }
@@ -76,13 +89,13 @@ class LibraryFragment : Fragment(), CountryAdapter.SelectListener {
     private fun updateList(channels: List<Channel>) {
         binding.countryCard.hideProgressIndicator()
 
-        if (!channels.isNullOrEmpty()) showList(channels)
+        if (channels.isNotEmpty()) showList(channels)
         else if (viewModel.isInSearchMode()) showEmptyState()
         else showLoading()
     }
 
     private fun showList(channels: List<Channel>) {
-        binding.shortcodes.adapter = LibraryChannelsAdapter(channels)
+        libraryAdapter.submitList(channels)
         binding.emptyState.root.visibility = View.GONE
         binding.shortcodesParent.visibility = VISIBLE
     }
diff --git a/app/src/main/java/com/hover/stax/ussd_library/LibraryViewModel.kt b/app/src/main/java/com/hover/stax/ussd_library/LibraryViewModel.kt
index 9f427dc81..8e8c77457 100644
--- a/app/src/main/java/com/hover/stax/ussd_library/LibraryViewModel.kt
+++ b/app/src/main/java/com/hover/stax/ussd_library/LibraryViewModel.kt
@@ -93,7 +93,7 @@ class LibraryViewModel(val repo: DatabaseRepo, val application: Application) : V
     }
 
     private fun filter(stagedChannels: List<Channel>) {
-        if(!stagedChannels.isNullOrEmpty()) {
+        if(stagedChannels.isNotEmpty()) {
             viewModelScope.launch(Dispatchers.IO) {
                 val filteredList = stagedChannels.filter { it.toString().toFilteringStandard()
                     .contains(filterQuery.value!!.toFilteringStandard()) }
diff --git a/app/src/main/java/com/hover/stax/utils/AnalyticsUtil.kt b/app/src/main/java/com/hover/stax/utils/AnalyticsUtil.kt
index 5648ae8f7..ebd538d31 100644
--- a/app/src/main/java/com/hover/stax/utils/AnalyticsUtil.kt
+++ b/app/src/main/java/com/hover/stax/utils/AnalyticsUtil.kt
@@ -9,6 +9,7 @@ import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.hover.sdk.api.Hover
 import com.hover.stax.BuildConfig
+import com.uxcam.UXCam
 import org.json.JSONException
 import org.json.JSONObject
 import timber.log.Timber
@@ -28,12 +29,15 @@ object AnalyticsUtil {
 		logAmplitude(event, null, context)
 		logFirebase(event, null, context)
 		logAppsFlyer(event, null, context)
+		logUXCamIfRequired(event)
+
 	}
 
 	@JvmStatic
 	fun logAnalyticsEvent(event: String, context: Context, excludeAmplitude: Boolean) {
 		logFirebase(event, null, context)
 		logAppsFlyer(event, null, context)
+		logUXCamIfRequired(event)
 	}
 
 	@JvmStatic
@@ -41,6 +45,13 @@ object AnalyticsUtil {
 		logAmplitude(event, args, context)
 		logFirebase(event, args, context)
 		logAppsFlyer(event, args, context)
+		logUXCamIfRequired(event)
+	}
+
+	private fun logUXCamIfRequired(event: String) {
+		if(event.lowercase().contains("visited")) {
+			UXCam.tagScreenName(event)
+		}
 	}
 
 	private fun logAmplitude(event: String, args: JSONObject?, context: Context) {
diff --git a/app/src/main/java/com/hover/stax/utils/NavUtil.kt b/app/src/main/java/com/hover/stax/utils/NavUtil.kt
index 5fe14e439..d851b9d57 100644
--- a/app/src/main/java/com/hover/stax/utils/NavUtil.kt
+++ b/app/src/main/java/com/hover/stax/utils/NavUtil.kt
@@ -10,7 +10,7 @@ object NavUtil {
         currentDestination?.getAction(navDirections.actionId)?.let { navigate(navDirections) }
     }
 
-    fun showTransactionDetailsFragment(navController: NavController, uuid: String) {
-        navigate(navController, MainNavigationDirections.actionGlobalTxnDetailsFragment(uuid))
+    fun showTransactionDetailsFragment(navController: NavController, uuid: String, isNewTransaction: Boolean? = false) {
+        navigate(navController, MainNavigationDirections.actionGlobalTxnDetailsFragment(uuid, isNewTransaction!!))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/hover/stax/utils/UIHelper.kt b/app/src/main/java/com/hover/stax/utils/UIHelper.kt
index 0e7f65f3d..e303c6f3e 100644
--- a/app/src/main/java/com/hover/stax/utils/UIHelper.kt
+++ b/app/src/main/java/com/hover/stax/utils/UIHelper.kt
@@ -9,6 +9,7 @@ import android.os.Build
 import android.text.SpannableString
 import android.text.style.UnderlineSpan
 import android.view.View
+import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
@@ -76,17 +77,25 @@ object UIHelper {
         }
     }
 
-    fun loadImage(fragment: Fragment, url: String, imageView: ImageView) = GlideApp.with(fragment)
+    fun ImageView.loadImage(fragment: Fragment, url: String) = GlideApp.with(fragment)
         .load(url)
         .placeholder(R.drawable.icon_bg_circle)
         .circleCrop()
-        .into(imageView)
+        .override(100)
+        .into(this)
 
-    fun loadImage(context: Context, url: String, imageView: ImageView) = GlideApp.with(context)
+    fun ImageView.loadImage(context: Context, url: String) = GlideApp.with(context)
         .load(url)
         .placeholder(R.drawable.icon_bg_circle)
         .circleCrop()
-        .into(imageView)
+        .override(100)
+        .into(this)
+
+    fun ImageButton.loadImage(context: Context, url: String) = GlideApp.with(context)
+        .load(url)
+        .placeholder(R.drawable.icon_bg_circle)
+        .circleCrop()
+        .into(this)
 
     fun loadImage(context: Context, url: String, target: CustomTarget<Drawable>) = GlideApp.with(context)
         .load(url)
diff --git a/app/src/main/java/com/hover/stax/utils/Utils.kt b/app/src/main/java/com/hover/stax/utils/Utils.kt
index ccac0a8a9..10027e7ec 100644
--- a/app/src/main/java/com/hover/stax/utils/Utils.kt
+++ b/app/src/main/java/com/hover/stax/utils/Utils.kt
@@ -7,9 +7,6 @@ import android.net.ConnectivityManager
 import android.net.Uri
 import android.view.View
 import android.view.inputmethod.InputMethodManager
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.Observer
 import com.google.firebase.messaging.FirebaseMessaging
 import com.hover.stax.R
 import com.hover.stax.permissions.PermissionUtils
@@ -17,7 +14,6 @@ import org.json.JSONException
 import org.json.JSONObject
 import timber.log.Timber
 import java.text.DecimalFormat
-import java.util.*
 
 
 object Utils {
diff --git a/app/src/main/java/com/hover/stax/utils/network/NetworkMonitor.kt b/app/src/main/java/com/hover/stax/utils/network/NetworkMonitor.kt
index a2bcc81a1..a65fe5d01 100644
--- a/app/src/main/java/com/hover/stax/utils/network/NetworkMonitor.kt
+++ b/app/src/main/java/com/hover/stax/utils/network/NetworkMonitor.kt
@@ -8,7 +8,6 @@ import android.net.NetworkCapabilities
 import android.net.NetworkRequest
 import android.os.Build
 import androidx.annotation.MainThread
-import androidx.annotation.RequiresApi
 import androidx.annotation.RequiresPermission
 import androidx.lifecycle.MutableLiveData
 import timber.log.Timber
diff --git a/app/src/main/java/com/hover/stax/utils/paymentLinkCryptography/Base64.java b/app/src/main/java/com/hover/stax/utils/paymentLinkCryptography/Base64.java
index 98637cdc8..03b3db6de 100644
--- a/app/src/main/java/com/hover/stax/utils/paymentLinkCryptography/Base64.java
+++ b/app/src/main/java/com/hover/stax/utils/paymentLinkCryptography/Base64.java
@@ -18,9 +18,6 @@
 
 import android.os.Build;
 
-import androidx.annotation.RequiresApi;
-
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 
 public class Base64 {
diff --git a/app/src/main/java/com/hover/stax/views/AbstractStatefulInput.java b/app/src/main/java/com/hover/stax/views/AbstractStatefulInput.java
index 0ab796d11..0c6232c52 100644
--- a/app/src/main/java/com/hover/stax/views/AbstractStatefulInput.java
+++ b/app/src/main/java/com/hover/stax/views/AbstractStatefulInput.java
@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.graphics.Typeface;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
diff --git a/app/src/main/java/com/hover/stax/views/RequestServiceDialog.kt b/app/src/main/java/com/hover/stax/views/RequestServiceDialog.kt
index 7a5cc29a3..40807b7b0 100644
--- a/app/src/main/java/com/hover/stax/views/RequestServiceDialog.kt
+++ b/app/src/main/java/com/hover/stax/views/RequestServiceDialog.kt
@@ -12,7 +12,6 @@ import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import com.hover.stax.R
 import com.hover.stax.utils.AnalyticsUtil
-import com.hover.stax.utils.UIHelper
 import org.json.JSONObject
 
 open class RequestServiceDialog (private var ctx: Context, private var mView: View) : AlertDialog(ctx) {
diff --git a/app/src/main/java/com/hover/stax/views/StaxCardView.kt b/app/src/main/java/com/hover/stax/views/StaxCardView.kt
index 09d588c12..e0770656f 100644
--- a/app/src/main/java/com/hover/stax/views/StaxCardView.kt
+++ b/app/src/main/java/com/hover/stax/views/StaxCardView.kt
@@ -11,8 +11,8 @@ import android.widget.FrameLayout
 import androidx.core.content.ContextCompat
 import com.hover.stax.R
 import com.hover.stax.databinding.StaxCardViewBinding
-import com.hover.stax.utils.Constants
 import com.hover.stax.utils.UIHelper
+import com.hover.stax.utils.UIHelper.loadImage
 
 open class StaxCardView(context: Context, attrs: AttributeSet) : FrameLayout(context, attrs) {
 
@@ -87,7 +87,7 @@ open class StaxCardView(context: Context, attrs: AttributeSet) : FrameLayout(con
     }
 
     fun setIcon(iconUrl: String) {
-        UIHelper.loadImage(context, iconUrl, binding.backButton)
+        binding.backButton.loadImage(context, iconUrl)
     }
 
     fun setOnClickIcon(listener: OnClickListener?) {
diff --git a/app/src/main/java/com/hover/stax/views/StaxDialog.kt b/app/src/main/java/com/hover/stax/views/StaxDialog.kt
index afc9dc546..5b936bcb6 100644
--- a/app/src/main/java/com/hover/stax/views/StaxDialog.kt
+++ b/app/src/main/java/com/hover/stax/views/StaxDialog.kt
@@ -3,15 +3,11 @@ package com.hover.stax.views
 import android.app.Activity
 import android.content.Context
 import android.graphics.PorterDuff
-import android.os.Build
-import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.Button
-import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
-import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.AppCompatButton
 import androidx.core.content.ContextCompat
diff --git a/app/src/main/res/anim/slide_down.xml b/app/src/main/res/anim/slide_down.xml
new file mode 100644
index 000000000..33647a676
--- /dev/null
+++ b/app/src/main/res/anim/slide_down.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+    <translate
+        android:duration="1000"
+        android:fromYDelta="-100%"
+        android:toYDelta="0%" >
+    </translate>
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_bonus.xml b/app/src/main/res/drawable/ic_bonus.xml
new file mode 100644
index 000000000..25c8dae51
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bonus.xml
@@ -0,0 +1,48 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="46dp"
+    android:height="46dp"
+    android:viewportWidth="46"
+    android:viewportHeight="46">
+  <path
+      android:pathData="M19.26,5.797C19.26,5.797 13.463,0 6.732,0C2.805,0 1.309,2.618 1.309,5.236C1.309,7.854 2.898,10.472 5.797,10.472L19.26,10.472V5.797Z"
+      android:fillColor="#FBE77B"/>
+  <path
+      android:pathData="M19.26,5.797C19.26,5.797 13.463,0 6.732,0C2.805,0 1.309,2.618 1.309,5.236C1.309,7.854 2.898,10.472 5.797,10.472L19.26,10.472V5.797Z"
+      android:fillColor="#FCBF29"/>
+  <path
+      android:pathData="M26.74,5.797C26.74,5.797 32.537,0 39.268,0C43.195,0 44.691,2.618 44.691,5.236C44.691,7.854 43.102,10.472 40.203,10.472L26.74,10.472V5.797Z"
+      android:fillColor="#FCBF29"/>
+  <path
+      android:pathData="M44.203,17.951L1.797,17.951C0.804,17.951 0,17.147 0,16.154L0,12.268C0,11.276 0.804,10.472 1.797,10.472L44.203,10.472C45.195,10.472 46,11.276 46,12.268V16.154C46,17.147 45.195,17.951 44.203,17.951Z"
+      android:fillColor="#FC1A40"/>
+  <path
+      android:pathData="M43.569,10.472V17.951H44.149C45.171,17.951 46,17.122 46,16.1V12.323C46,11.3 45.171,10.471 44.149,10.471H43.569V10.472Z"
+      android:fillColor="#FC1A40"/>
+  <path
+      android:pathData="M17.39,10.472H28.61V17.951H17.39V10.472Z"
+      android:fillColor="#FCBF29"/>
+  <path
+      android:pathData="M41.772,46H4.228C3.236,46 2.431,45.195 2.431,44.203L2.431,17.951L43.569,17.951V44.203C43.569,45.195 42.765,46 41.772,46Z"
+      android:fillColor="#FC1A40"/>
+  <path
+      android:pathData="M2.431,17.951L43.569,17.951V20.195L2.431,20.195V17.951Z"
+      android:fillColor="#C60034"/>
+  <path
+      android:pathData="M19.26,17.951H26.74V46H19.26V17.951Z"
+      android:fillColor="#FCBF29"/>
+  <path
+      android:pathData="M19.26,17.951H26.74V20.195H19.26V17.951Z"
+      android:fillColor="#FE9923"/>
+  <path
+      android:pathData="M29.358,8.602C28.969,8.602 28.635,8.364 28.494,8.025C28.736,7.937 28.996,7.85 29.266,7.774C29.635,7.67 29.85,7.286 29.746,6.917C29.642,6.548 29.258,6.333 28.889,6.437C28.73,6.482 28.574,6.53 28.423,6.58V4.348C27.358,5.179 26.74,5.797 26.74,5.797V10.472H40.203C41.765,10.472 42.945,9.711 43.703,8.602H29.358Z"
+      android:fillColor="#FE9923"/>
+  <path
+      android:pathData="M17.577,4.348V6.58C17.426,6.53 17.27,6.482 17.111,6.437C16.742,6.333 16.358,6.548 16.254,6.917C16.15,7.286 16.365,7.67 16.734,7.774C17.004,7.85 17.264,7.937 17.506,8.025C17.365,8.364 17.031,8.602 16.642,8.602H2.297C3.055,9.711 4.235,10.471 5.797,10.471H19.26V5.797C19.26,5.797 18.643,5.179 17.577,4.348Z"
+      android:fillColor="#FE9923"/>
+  <path
+      android:pathData="M26.74,10.472H19.26V5.746C19.26,5.051 19.823,4.488 20.518,4.488H25.482C26.177,4.488 26.74,5.051 26.74,5.746V10.472Z"
+      android:fillColor="#FCBF29"/>
+  <path
+      android:pathData="M19.26,8.602H26.74V10.472H19.26V8.602Z"
+      android:fillColor="#FE9923"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_info_red.xml b/app/src/main/res/drawable/ic_info_red.xml
deleted file mode 100644
index b087412db..000000000
--- a/app/src/main/res/drawable/ic_info_red.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="@color/stax_state_red"
-        android:viewportHeight="24.0" android:viewportWidth="24.0"
-        android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_warning.xml b/app/src/main/res/drawable/ic_warning.xml
index c36f0c175..0f5d81dde 100644
--- a/app/src/main/res/drawable/ic_warning.xml
+++ b/app/src/main/res/drawable/ic_warning.xml
@@ -1,5 +1,22 @@
-<vector android:height="24dp" android:tint="#FFCA32"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <group>
+    <clip-path
+        android:pathData="M0,0h16v16h-16z"/>
+    <path
+        android:pathData="M15.5,8.01c0,4.14 -3.36,7.5 -7.5,7.5S0.5,12.15 0.5,8.01 3.86,0.51 8,0.51s7.5,3.36 7.5,7.5h0Z"
+        android:fillColor="#004d9c"/>
+    <path
+        android:pathData="M8,0C3.58,0 0,3.58 0,8s3.58,8 8,8c1.29,0 2.56,-0.31 3.7,-0.91 0.18,-0.07 0.31,-0.23 0.32,-0.43 0.02,-0.19 -0.08,-0.38 -0.25,-0.47 -0.17,-0.1 -0.38,-0.09 -0.54,0.02 -2.78,1.45 -6.19,0.88 -8.34,-1.41C0.75,10.51 0.39,7.07 2.01,4.38 3.64,1.69 6.86,0.42 9.88,1.26c3.03,0.84 5.12,3.6 5.12,6.74 0,0.52 -0.06,1.04 -0.17,1.54 -0.06,0.28 0.12,0.55 0.39,0.61 0.28,0.06 0.55,-0.11 0.61,-0.39 0.12,-0.58 0.18,-1.17 0.17,-1.76C16,3.58 12.42,0 8,0h0Z"
+        android:fillColor="#fff"/>
+  </group>
+  <path
+      android:pathData="M13.5,9c-0.28,0 -0.5,0.22 -0.5,0.5v4c0,0.28 0.22,0.5 0.5,0.5s0.5,-0.22 0.5,-0.5v-4c0,-0.28 -0.22,-0.5 -0.5,-0.5h0ZM8,3.53v4.7l-2.78,1.85c-0.23,0.16 -0.29,0.47 -0.14,0.7 0.1,0.14 0.25,0.22 0.42,0.22 0.1,0 0.19,-0.03 0.28,-0.08l3,-2 0.07,-0.07 0.06,-0.08v-0.08s0,-0.07 0,-0.1V3.54c0.02,-0.26 -0.15,-0.49 -0.41,-0.54 -0.14,0 -0.27,0.05 -0.37,0.15 -0.1,0.1 -0.14,0.24 -0.13,0.38h0Z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M14,15.5c0,0.28 -0.22,0.5 -0.5,0.5s-0.5,-0.22 -0.5,-0.5 0.22,-0.5 0.5,-0.5 0.5,0.22 0.5,0.5h0Z"
+      android:fillColor="#fff"/>
 </vector>
diff --git a/app/src/main/res/drawable/party.png b/app/src/main/res/drawable/party.png
new file mode 100644
index 000000000..761e55f6c
Binary files /dev/null and b/app/src/main/res/drawable/party.png differ
diff --git a/app/src/main/res/drawable/stax_slide_1.jpg b/app/src/main/res/drawable/stax_slide_1.jpg
deleted file mode 100644
index c87f1f008..000000000
Binary files a/app/src/main/res/drawable/stax_slide_1.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/stax_slide_3.jpg b/app/src/main/res/drawable/stax_slide_3.jpg
deleted file mode 100644
index f2f85ec40..000000000
Binary files a/app/src/main/res/drawable/stax_slide_3.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/text_btn_selector.xml b/app/src/main/res/drawable/text_btn_selector.xml
new file mode 100644
index 000000000..8e805ac85
--- /dev/null
+++ b/app/src/main/res/drawable/text_btn_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@android:color/transparent" android:state_pressed="false" />
+    <item android:drawable="@color/cardDarkBlue" android:state_pressed="true" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b615bf043..bb6f0fbca 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.hover.stax.views.StaxNavView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+<com.hover.stax.views.StaxNavView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/home_root"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/card_bonuses.xml b/app/src/main/res/layout/card_bonuses.xml
new file mode 100644
index 000000000..c9b945189
--- /dev/null
+++ b/app/src/main/res/layout/card_bonuses.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/cardBonus"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/margin_13"
+        app:cardBackgroundColor="@color/cardViewColor"
+        app:cardCornerRadius="@dimen/radius"
+        app:cardElevation="8dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_13">
+
+        <TextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/margin_16"
+                android:text="@string/get_rewarded"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_19"
+                app:fontFamily="@font/brutalista_bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+                android:id="@+id/message"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/margin_16"
+                android:layout_marginTop="@dimen/margin_10"
+                android:layout_marginEnd="@dimen/margin_16"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_16"
+                app:layout_constraintBottom_toTopOf="@id/learnMore"
+                app:layout_constraintEnd_toStartOf="@id/icon"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/title"
+                tools:text="@string/bonus_placeholder" />
+
+        <TextView
+                android:id="@+id/learnMore"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/margin_16"
+                android:layout_marginTop="@dimen/margin_10"
+                android:layout_marginEnd="@dimen/margin_16"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_13"
+                app:layout_goneMarginBottom="@dimen/margin_16"
+                android:layout_marginBottom="@dimen/margin_8"
+                app:layout_constraintBottom_toTopOf="@id/cta"
+                app:layout_constraintEnd_toStartOf="@id/icon"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/message"
+                android:text="@string/learn_more" />
+
+        <TextView
+                android:id="@+id/cta"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/margin_3"
+                android:background="@drawable/text_btn_selector"
+                android:padding="@dimen/margin_13"
+                android:text="@string/top_up"
+                android:textAllCaps="false"
+                android:textColor="@color/brightBlue"
+                android:textSize="@dimen/text_16"
+                app:fontFamily="@font/brutalista_medium"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+        <ImageView
+                android:id="@+id/icon"
+                android:layout_width="70dp"
+                android:layout_height="0dp"
+                android:layout_marginEnd="@dimen/margin_16"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/ic_bonus" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_add_channels.xml b/app/src/main/res/layout/fragment_add_channels.xml
index 8bd342046..7eaf101e1 100644
--- a/app/src/main/res/layout/fragment_add_channels.xml
+++ b/app/src/main/res/layout/fragment_add_channels.xml
@@ -9,9 +9,9 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_marginBottom="@dimen/margin_13"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
                 android:layout_width="match_parent"
@@ -29,7 +29,7 @@
                 <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/selectedList"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
+                        android:layout_height="wrap_content" />
 
             </com.hover.stax.views.StaxCardView>
 
@@ -42,38 +42,40 @@
                     app:title="@string/add_an_account">
 
                 <com.hover.stax.views.StaxTextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/search"
-                    android:inputType="textFilter"
-                    android:imeOptions="actionDone"
-                    android:id="@+id/searchInput"/>
+                        android:id="@+id/searchInput"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/search"
+                        android:imeOptions="actionDone"
+                        android:inputType="textFilter" />
 
-                <include layout="@layout/no_account_empty_state" android:id="@+id/emptyState"/>
+                <include
+                        android:id="@+id/emptyState"
+                        layout="@layout/no_account_empty_state" />
 
                 <TextView
-                    android:id="@+id/error_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/margin_13"
-                    android:layout_marginTop="@dimen/margin_13"
-                    android:drawablePadding="@dimen/margin_5"
-                    android:layout_marginBottom="@dimen/margin_8"
-                    app:fontFamily="@font/brutalista_medium"
-                    android:gravity="center_vertical"
-                    android:text="@string/loading"
-                    android:textColor="@color/stax_state_blue"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    android:visibility="visible"
-                    app:drawableStartCompat="@drawable/ic_info" />
+                        android:id="@+id/error_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/margin_13"
+                        android:layout_marginTop="@dimen/margin_13"
+                        android:layout_marginBottom="@dimen/margin_8"
+                        android:drawablePadding="@dimen/margin_5"
+                        android:gravity="center_vertical"
+                        android:text="@string/loading"
+                        android:textColor="@color/stax_state_blue"
+                        android:visibility="visible"
+                        app:drawableStartCompat="@drawable/ic_info"
+                        app:fontFamily="@font/brutalista_medium"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
                 <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/channelsList"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:layout_constraintTop_toBottomOf="@id/error_text" />
+                        android:id="@+id/channelsList"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        app:layout_constraintTop_toBottomOf="@id/error_text" />
 
             </com.hover.stax.views.StaxCardView>
 
@@ -86,9 +88,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
-            android:layout_marginBottom="@dimen/margin_21"
             android:layout_marginTop="@dimen/margin_13"
             android:layout_marginEnd="@dimen/margin_13"
+            android:layout_marginBottom="@dimen/margin_21"
             android:text="@string/btn_continue"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/fragment_bounty_list.xml b/app/src/main/res/layout/fragment_bounty_list.xml
index 8cefdddc2..2664df183 100644
--- a/app/src/main/res/layout/fragment_bounty_list.xml
+++ b/app/src/main/res/layout/fragment_bounty_list.xml
@@ -23,6 +23,7 @@
                     android:id="@+id/bounty_country_dropdown"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:editable="false"
                     android:layout_marginTop="@dimen/margin_8"
                     android:hint="@string/select_country"
                     android:text="@string/country" />
@@ -32,6 +33,7 @@
                 android:id="@+id/bountiesRecyclerView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 android:animateLayoutChanges="false"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/countryFilter" />
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4aa0a4c0c..dbe66ebee 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -13,8 +13,8 @@
                 android:id="@+id/header"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
                 android:layout_marginTop="@dimen/margin_5"
+                android:orientation="horizontal"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
@@ -39,12 +39,23 @@
                     app:layout_goneMarginTop="@dimen/margin_5" />
         </RelativeLayout>
 
+        <include
+                android:id="@+id/bonusCard"
+                layout="@layout/card_bonuses"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/margin_13"
+                android:visibility="gone"
+                android:layout_marginTop="@dimen/margin_13"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/header" />
+
         <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/balance_fragment"
                 android:name="com.hover.stax.balances.BalancesFragment"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@id/header" />
+                app:layout_constraintTop_toBottomOf="@id/bonusCard" />
 
         <include
                 android:id="@+id/wellnessCard"
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index f8526e519..4c6446ebc 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -21,23 +21,26 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/margin_8"
                     android:hint="@string/select_country"
+                    android:editable="false"
                     android:text="@string/country" />
 
             <com.hover.stax.views.StaxTextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/search"
-                android:inputType="textFilter"
-                android:imeOptions="actionDone"
-                android:id="@+id/searchInput"/>
+                    android:id="@+id/searchInput"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/search"
+                    android:imeOptions="actionDone"
+                    android:inputType="textFilter" />
         </com.hover.stax.views.StaxCardView>
 
-        <include layout="@layout/no_account_empty_state" android:id="@+id/emptyState"/>
+        <include
+                android:id="@+id/emptyState"
+                layout="@layout/no_account_empty_state" />
 
         <com.hover.stax.views.StaxCardView
+                android:id="@+id/shortcodesParent"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-            android:id="@+id/shortcodesParent">
+                android:layout_height="wrap_content">
 
             <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/shortcodes"
diff --git a/app/src/main/res/layout/fragment_transaction.xml b/app/src/main/res/layout/fragment_transaction.xml
index 1f3971145..0c27f6cc7 100644
--- a/app/src/main/res/layout/fragment_transaction.xml
+++ b/app/src/main/res/layout/fragment_transaction.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/ft_mainBg"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:descendantFocusability="afterDescendants"
+    android:orientation="vertical">
+<androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="@dimen/margin_13">
@@ -33,4 +39,6 @@
 
     </com.hover.stax.views.StaxCardView>
 
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
+    <include layout="@layout/share_excitement_layout" android:id="@+id/share_layout"/>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_transfer.xml b/app/src/main/res/layout/fragment_transfer.xml
index a5620298c..44525f73e 100644
--- a/app/src/main/res/layout/fragment_transfer.xml
+++ b/app/src/main/res/layout/fragment_transfer.xml
@@ -26,15 +26,24 @@
                 layout="@layout/transfer_card_summary"
                 android:visibility="gone" />
 
+        <include
+                android:id="@+id/bonusLayout"
+                layout="@layout/card_bonuses"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/margin_13"
+                android:layout_marginBottom="@dimen/margin_13"
+                android:visibility="gone" />
+
         <TextView
+                android:id="@+id/noWorryText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/margin_13"
+                android:layout_marginBottom="@dimen/margin_10"
                 android:lineSpacingExtra="2sp"
-                android:id="@+id/noWorryText"
                 android:text="@string/noworry_explain"
                 android:textColor="@color/offWhite"
-                android:layout_marginBottom="@dimen/margin_10"
                 android:textSize="@dimen/text_16" />
 
         <Button
diff --git a/app/src/main/res/layout/info_text_layout.xml b/app/src/main/res/layout/info_text_layout.xml
index a64836c03..406f1c5bd 100644
--- a/app/src/main/res/layout/info_text_layout.xml
+++ b/app/src/main/res/layout/info_text_layout.xml
@@ -5,6 +5,7 @@
     android:layout_width="wrap_content"
     android:background="?selectableItemBackground"
     android:layout_height="wrap_content">
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/no_account_empty_state.xml b/app/src/main/res/layout/no_account_empty_state.xml
index d84cba773..32765e477 100644
--- a/app/src/main/res/layout/no_account_empty_state.xml
+++ b/app/src/main/res/layout/no_account_empty_state.xml
@@ -1,57 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:visibility="gone"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <TextView
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/no_accounts_found_desc"
-        android:gravity="center"
-        android:id="@+id/noAccountFoundDesc"
-        android:drawableTop="@drawable/ic_baseline_manage_search_24"
-        app:fontFamily="@font/brutalista_regular"
-        android:padding="@dimen/margin_16"
-        android:drawablePadding="@dimen/margin_16"
-        android:textColor="@color/offWhite"
-        android:layout_marginBottom="32dp"
-        android:textSize="@dimen/text_16"/>
+        android:layout_height="match_parent"
+        android:visibility="gone">
 
+    <TextView
+            android:id="@+id/noAccountFoundDesc"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="32dp"
+            android:drawablePadding="@dimen/margin_16"
+            android:gravity="center"
+            android:padding="@dimen/margin_16"
+            android:text="@string/no_accounts_found_desc"
+            android:textColor="@color/offWhite"
+            android:textSize="@dimen/text_16"
+            app:drawableTopCompat="@drawable/ic_baseline_manage_search_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/margin_10"
-        android:id="@+id/informUs"
-        android:background="@drawable/blue_cornered_background"
-        android:layout_margin="@dimen/margin_13"
-        android:orientation="vertical">
-
-        <TextView
+    <TextView
+            android:id="@+id/desc"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/cant_find_institution"
-            app:fontFamily="@font/brutalista_regular"
+            android:layout_marginTop="@dimen/margin_26"
             android:gravity="center"
-            android:textColor="@color/buttonColor"
-            />
+            android:text="@string/cant_find_institution"
+            android:textSize="@dimen/text_16"
+            app:layout_constraintTop_toBottomOf="@id/noAccountFoundDesc" />
 
-        <TextView
-            android:layout_width="wrap_content"
+    <com.google.android.material.button.MaterialButton
+            android:id="@+id/informUs"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/margin_16"
+            android:layout_marginTop="@dimen/margin_10"
             android:text="@string/inform_us_here"
-            android:gravity="center"
-            android:layout_gravity="center"
-            android:drawablePadding="@dimen/margin_8"
-            android:drawableEnd="@drawable/ic_baseline_open_in_new_16"
+            android:textAllCaps="false"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:textSize="@dimen/text_16"
+            android:textColor="@color/brightBlue"
+            app:backgroundTint="@color/button_white"
             app:fontFamily="@font/brutalista_medium"
-            android:textColor="@color/brightBluePressed"
-            />
-
-    </LinearLayout>
-
-
-</LinearLayout>
\ No newline at end of file
+            app:icon="@drawable/ic_baseline_open_in_new_16"
+            app:iconGravity="textEnd"
+            app:iconTint="@color/brightBlue"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/desc" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_card_support.xml b/app/src/main/res/layout/settings_card_support.xml
index 08e0de4ab..2a5dff723 100644
--- a/app/src/main/res/layout/settings_card_support.xml
+++ b/app/src/main/res/layout/settings_card_support.xml
@@ -67,10 +67,10 @@
             <com.google.android.material.checkbox.MaterialCheckBox
                     android:id="@+id/marketingOptIn"
                     android:layout_width="wrap_content"
-                    android:clickable="false"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
-                    android:layout_marginEnd="-10dp" />
+                    android:layout_marginEnd="-3dp"
+                    android:clickable="false" />
 
         </RelativeLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/share_excitement_layout.xml b/app/src/main/res/layout/share_excitement_layout.xml
new file mode 100644
index 000000000..5903367a2
--- /dev/null
+++ b/app/src/main/res/layout/share_excitement_layout.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/bottom_sheet"
+    android:visibility="gone"
+    android:background="@color/brightBlue"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/margin_16"
+    app:behavior_hideable="true"
+    app:behavior_peekHeight="@dimen/margin_55"
+    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+    <ImageView
+        android:id="@+id/emoticon"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:scaleType="centerCrop"
+        android:contentDescription="@string/share_desc"
+        android:src="@drawable/party"
+        />
+
+    <TextView
+        android:id="@+id/share_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_toEndOf="@id/emoticon"
+        android:fontFamily="@font/brutalista_bold"
+        android:text="@string/transaction_successful"
+        android:textStyle="bold"
+        android:textSize="@dimen/text_16"
+        android:textAlignment="viewEnd"
+        />
+
+    <TextView
+        android:id="@+id/share_subTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_below="@id/share_title"
+        android:layout_toEndOf="@id/emoticon"
+        android:fontFamily="@font/brutalista_regular"
+        android:text="@string/share_desc"
+        android:textAlignment="viewEnd" />
+
+    <TextView
+        android:id="@+id/share_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?selectableItemBackground"
+        android:layout_alignParentEnd="true"
+        android:layout_below="@id/share_subTitle"
+        android:paddingStart="@dimen/margin_13"
+        android:paddingBottom="@dimen/margin_13"
+        android:paddingTop="@dimen/margin_13"
+        android:paddingEnd="0dp"
+        android:layout_toEndOf="@id/emoticon"
+        android:fontFamily="@font/brutalista_bold"
+        android:textStyle="bold"
+        android:text="@string/share"
+        android:textAlignment="viewEnd"
+        android:textColor="@color/blue_state_color" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/stax_spinner_item_with_logo.xml b/app/src/main/res/layout/stax_spinner_item_with_logo.xml
index 2502d75d5..a4e4f448d 100644
--- a/app/src/main/res/layout/stax_spinner_item_with_logo.xml
+++ b/app/src/main/res/layout/stax_spinner_item_with_logo.xml
@@ -1,54 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
-        android:orientation="vertical">
+        android:padding="@dimen/margin_13">
 
-    <RelativeLayout
-            android:layout_width="match_parent"
+    <com.google.android.material.checkbox.MaterialCheckBox
+            android:id="@+id/service_item_checkbox"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="@dimen/margin_13">
-
-        <com.google.android.material.checkbox.MaterialCheckBox
-                android:id="@+id/service_item_checkbox"
-                android:layout_width="wrap_content"
-                android:visibility="gone"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true" />
+            android:layout_centerVertical="true"
+            android:visibility="gone" />
 
-        <ImageView
-                android:id="@+id/service_item_image_id"
-                android:layout_width="45dp"
-                android:layout_height="45dp"
-                android:layout_centerVertical="true"
-                android:layout_gravity="center_vertical"
-                android:layout_toEndOf="@id/service_item_checkbox"
-                android:scaleType="centerCrop"
-                app:srcCompat="@drawable/ic_grey_circle" />
+    <ImageView
+            android:id="@+id/service_item_image_id"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_centerVertical="true"
+            android:layout_gravity="center_vertical"
+            android:layout_toEndOf="@id/service_item_checkbox"
+            android:scaleType="centerCrop"
+            app:srcCompat="@drawable/ic_grey_circle" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/service_item_name_id"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginStart="@dimen/margin_3"
-                android:layout_toEndOf="@id/service_item_image_id"
-                android:ellipsize="marquee"
-                android:paddingStart="@dimen/margin_13"
-                android:paddingEnd="@dimen/margin_34"
-                android:singleLine="true"
-                android:textColor="@drawable/spinner_state_selector"
-                android:textSize="@dimen/text_16" />
+    <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/service_item_name_id"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/margin_3"
+            android:layout_toEndOf="@id/service_item_image_id"
+            android:ellipsize="marquee"
+            android:paddingStart="@dimen/margin_13"
+            android:paddingEnd="@dimen/margin_34"
+            android:singleLine="true"
+            android:textColor="@drawable/spinner_state_selector"
+            android:textSize="@dimen/text_16" />
 
-        <TextView
-                android:id="@+id/service_item_id"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:textColor="@color/offWhite"
-                android:textSize="@dimen/text_13"
-                android:visibility="gone" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
+    <TextView
+            android:id="@+id/service_item_id"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAlignment="center"
+            android:textColor="@color/offWhite"
+            android:textSize="@dimen/text_13"
+            android:visibility="gone" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/transaction_details_info_card.xml b/app/src/main/res/layout/transaction_details_info_card.xml
index 14fe36d7a..b4056d623 100644
--- a/app/src/main/res/layout/transaction_details_info_card.xml
+++ b/app/src/main/res/layout/transaction_details_info_card.xml
@@ -142,6 +142,24 @@
                 android:textSize="@dimen/text_16" />
     </TableRow>
 
+    <TableRow
+            android:id="@+id/bonusRow"
+            android:visibility="gone"
+            android:layout_marginTop="@dimen/margin_18">
+
+        <TextView
+                android:text="@string/bonus_amount_label"
+                android:textColor="@color/offWhite"
+                android:textSize="@dimen/text_16" />
+
+        <TextView
+                android:id="@+id/bonusAmount"
+                android:layout_weight="1"
+                android:textAlignment="viewEnd"
+                android:textColor="@color/offWhite"
+                android:textSize="@dimen/text_16" />
+    </TableRow>
+
     <TableRow
             android:id="@+id/feeRow"
             android:layout_marginTop="@dimen/margin_18">
diff --git a/app/src/main/res/layout/transaction_details_primarystatus.xml b/app/src/main/res/layout/transaction_details_primarystatus.xml
index d1a0304fb..49fd02e35 100644
--- a/app/src/main/res/layout/transaction_details_primarystatus.xml
+++ b/app/src/main/res/layout/transaction_details_primarystatus.xml
@@ -2,12 +2,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        xmlns:tools="http://schemas.android.com/tools"
         android:gravity="center"
         android:orientation="vertical">
 
     <ImageView
             android:id="@+id/statusIcon"
             android:layout_width="@dimen/margin_55"
+            tools:src="@drawable/ic_success"
             android:layout_height="@dimen/margin_55" />
 
     <TextView
@@ -15,6 +17,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin_16"
+            tools:text="KES 15"
             android:fontFamily="@font/brutalista_medium"
             android:gravity="center"
             android:textSize="@dimen/text_21" />
diff --git a/app/src/main/res/layout/transaction_details_secondary_status.xml b/app/src/main/res/layout/transaction_details_secondary_status.xml
index 0e3614443..3867ff25e 100644
--- a/app/src/main/res/layout/transaction_details_secondary_status.xml
+++ b/app/src/main/res/layout/transaction_details_secondary_status.xml
@@ -1,53 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="wrap_content"
+        android:background="@drawable/grey_background">
 
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/grey_background"
-            android:orientation="horizontal"
-            android:paddingVertical="@dimen/margin_16">
-
-        <ImageView
-                android:id="@+id/status_icon"
-                android:layout_width="@dimen/margin_43"
-                android:layout_height="@dimen/margin_43"
-                android:layout_marginStart="@dimen/margin_16" />
+    <ImageView
+            android:id="@+id/status_icon"
+            android:layout_width="@dimen/margin_43"
+            android:layout_height="@dimen/margin_43"
+            android:layout_marginHorizontal="@dimen/margin_16"
+            android:layout_marginTop="@dimen/margin_16"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:src="@drawable/ic_stax"
+            tools:ignore="ContentDescription" />
 
-        <TextView
-                android:id="@+id/status_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/margin_16"
-                android:background="@drawable/grey_background"
-                android:fontFamily="@font/brutalista_regular" />
-    </LinearLayout>
+    <TextView
+            android:id="@+id/status_text"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/margin_16"
+            android:layout_marginTop="@dimen/margin_16"
+            android:layout_marginBottom="@dimen/margin_16"
+            app:layout_constraintBottom_toTopOf="@id/btnRetryTransaction"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/status_icon"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="@string/incomplete_account_setup_desc" />
 
-    <RelativeLayout
-            android:id="@+id/transactionRetryButtonLayoutId"
+    <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnRetryTransaction"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginTop="-2dp"
-            android:gravity="end"
-            android:orientation="horizontal"
-            android:visibility="visible">
-
-        <TextView
-                android:id="@+id/btnRetryTransaction"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/stax_state_blue"
-                android:fontFamily="@font/brutalista_regular"
-                android:gravity="center"
-                android:padding="@dimen/margin_16"
-                android:text="@string/try_again"
-                android:textAlignment="center"
-                android:textColor="@color/offWhite" />
-
-    </RelativeLayout>
+            android:fontFamily="@font/brutalista_regular"
+            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:text="@string/try_again"
+            android:textAllCaps="false"
+            android:textColor="@color/offWhite"
+            app:backgroundTint="@color/stax_state_blue"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/transaction_list_item.xml b/app/src/main/res/layout/transaction_list_item.xml
index eb9cd96d6..25c400327 100644
--- a/app/src/main/res/layout/transaction_list_item.xml
+++ b/app/src/main/res/layout/transaction_list_item.xml
@@ -1,72 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:id="@+id/transaction_item_layout"
-	android:orientation="vertical">
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/transaction_item_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
-	<TextView
-		android:id="@+id/li_header"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:paddingHorizontal="@dimen/margin_10"
-		android:paddingVertical="@dimen/margin_16"
-		android:textColor="@color/grey"
-		android:textSize="@dimen/text_13"
-		app:fontFamily="@font/brutalista_medium"
-		android:background="@color/cardViewColor"
-		android:visibility="gone" />
+    <TextView
+            android:id="@+id/li_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/cardViewColor"
+            android:paddingHorizontal="@dimen/margin_10"
+            android:paddingVertical="@dimen/margin_16"
+            android:textColor="@color/grey"
+            android:textSize="@dimen/text_13"
+            android:visibility="gone"
+            app:fontFamily="@font/brutalista_medium" />
 
-	<LinearLayout
-		android:orientation="horizontal"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:paddingHorizontal="@dimen/margin_10"
-		android:paddingTop="@dimen/margin_10"
-		android:paddingBottom="@dimen/margin_13"
-		android:background="?attr/selectableItemBackground"
-		android:layout_gravity="center_vertical"
-		android:gravity="center_vertical">
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="?attr/selectableItemBackground"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingHorizontal="@dimen/margin_10"
+            android:paddingTop="@dimen/margin_10"
+            android:paddingBottom="@dimen/margin_13">
 
-		<LinearLayout
-			android:orientation="vertical"
-			android:layout_weight="1"
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:layout_marginEnd="@dimen/margin_13"
-			android:layout_gravity="center_vertical"
-			android:gravity="center_vertical">
+        <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="@dimen/margin_13"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
 
-			<TextView android:id="@+id/li_description"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="center_vertical"
-				android:textColor="@color/offWhite"
-				android:textSize="@dimen/text_16"
-				android:fontFamily="@font/brutalista_regular"/>
+            <TextView
+                    android:id="@+id/li_description"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/brutalista_regular"
+                    android:gravity="center_vertical"
+                    android:textColor="@color/offWhite"
+                    android:textSize="@dimen/text_16" />
 
-			<TextView android:id="@+id/li_status"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/margin_5"
-				android:drawablePadding="@dimen/margin_5"
-				android:fontFamily="@font/brutalista_regular"
-				android:textColor="@color/offWhite"
-				android:textSize="@dimen/text_13"
-				android:text="@string/pending_callout"
-				app:drawableStartCompat="@drawable/ic_info" />
+            <TextView
+                    android:id="@+id/li_status"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_5"
+                    android:drawablePadding="@dimen/margin_5"
+                    android:fontFamily="@font/brutalista_regular"
+                    android:gravity="center_vertical"
+                    android:text="@string/pending_callout"
+                    android:textColor="@color/offWhite"
+                    android:textSize="@dimen/text_13"
+                    app:drawableStartCompat="@drawable/ic_info" />
 
-		</LinearLayout>
+        </LinearLayout>
 
-		<TextView android:id="@+id/li_amount"
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:minWidth="@dimen/margin_89"
-			android:gravity="center_vertical|end"
-			android:fontFamily="@font/brutalista_regular"
-			android:textColor="@color/white"
-			android:textSize="@dimen/text_21" />
+        <TextView
+                android:id="@+id/li_amount"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:fontFamily="@font/brutalista_regular"
+                android:gravity="center_vertical|end"
+                android:minWidth="@dimen/margin_89"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_21" />
 
-	</LinearLayout>
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/home_navigation.xml b/app/src/main/res/navigation/home_navigation.xml
index b3406a365..a20ade303 100644
--- a/app/src/main/res/navigation/home_navigation.xml
+++ b/app/src/main/res/navigation/home_navigation.xml
@@ -107,10 +107,10 @@
 
 
     <fragment
-        android:id="@+id/navigation_manage_permission"
-        android:name="com.hover.stax.permissions.ManagePermissionsFragment"
-        android:label="@string/manage_permissions_title"
-        tools:layout="@layout/manage_permissions_layout"/>
+            android:id="@+id/navigation_manage_permission"
+            android:name="com.hover.stax.permissions.ManagePermissionsFragment"
+            android:label="@string/manage_permissions_title"
+            tools:layout="@layout/manage_permissions_layout" />
 
     <fragment
             android:id="@+id/navigation_settings"
@@ -136,8 +136,9 @@
                 android:id="@+id/action_navigation_settings_to_wellnessFragment"
                 app:destination="@id/tipsFragment" />
 
-        <action android:id="@+id/action_navigation_settings_to_managePermissionFragment"
-            app:destination="@+id/navigation_manage_permission"/>
+        <action
+                android:id="@+id/action_navigation_settings_to_managePermissionFragment"
+                app:destination="@+id/navigation_manage_permission" />
 
         <deepLink
                 android:id="@+id/settingsDL"
@@ -160,14 +161,22 @@
         <argument
                 android:name="uuid"
                 app:argType="string" />
+        <argument
+            android:name="isNewTransaction"
+            app:argType="boolean"
+            />
+
         <action
                 android:id="@+id/action_transactionDetailsFragment_to_bountyListFragment"
                 app:destination="@id/bountyListFragment" />
+        <action
+                android:id="@+id/action_transactionDetailsFragment_to_navigation_transfer"
+                app:destination="@id/navigation_transfer" />
         <action
                 android:id="@+id/action_txnDetailsFragment_to_navigationHome"
                 app:destination="@id/navigation_home"
                 app:popUpTo="@id/transactionDetailsFragment"
-                app:popUpToInclusive="true"/>
+                app:popUpToInclusive="true" />
     </fragment>
 
     <fragment
@@ -266,6 +275,10 @@
                 android:defaultValue="@null"
                 app:argType="string"
                 app:nullable="true" />
+        <argument
+                android:name="channelId"
+                android:defaultValue="0"
+                app:argType="integer" />
 
         <deepLink
                 android:id="@+id/transferDL"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1d6bee651..081c9f16e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -28,6 +28,7 @@
 	<color name="lighter_grey">#3F434A</color>
 	<color name="icon_blue">#0091E3</color>
 	<color name="faint_blue">#CDE5FE</color>
+	<color name="button_white">#EDF9FF</color>
 
 	<color name="banner_permission_primary">#45E6CE</color>
 	<color name="banner_gist_primary">#00CCFF</color>
diff --git a/app/src/main/res/values/logging_strings.xml b/app/src/main/res/values/logging_strings.xml
index fe1e9f367..42e5b1b4b 100644
--- a/app/src/main/res/values/logging_strings.xml
+++ b/app/src/main/res/values/logging_strings.xml
@@ -156,4 +156,6 @@
 	<string name="interacted_with_tutorial" translatable="false">Interacted with tutorial</string>
 	<string name="clicked_continue" translatable="false">Clicked continue button</string>
 
+	<string name="clicked_bonus_airtime_banner" translatable="false">Clicked bonus airtime banner</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 796bc9e56..ad71682e5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <resources>
     <string name="amp" public="false" translatable="false">e3b51457136ad623213ade89a42a288f</string>
     <string name="appsflyer_key" public="false" translatable="false">4B6DDdYFw55PmVPTwr8Ski</string>
+    <string name="uxcam_key" public="false" translatable="false">obijrn00q2aip9z</string>
     <string name="app_name" translatable="false">Stax</string>
     <string name="payment_root_url" translatable="false">https://stax.me/pay?%1$s</string>
     <string name="payment_url_end" translatable="false">%1$s-%2$d-%3$s-%4$d</string>
@@ -222,6 +223,11 @@
     <string name="perm_cta1">Show settings</string>
     <string name="perm_cta2">Show settings again</string>
 
+    <!-- Share Excitement -->
+    <string name="share_desc">Share Stax with your friends</string>
+    <string name="share">Share</string>
+    <string name="transaction_successful">Transaction successful</string>
+
     <!-- Hover Session -->
     <string name="balance_msg">Checking %1$s balance</string>
     <string name="airtime_msg">Buying airtime</string>
@@ -710,5 +716,19 @@
     <string name="login_dialog_desc">Please sign in to Stax with Google to be able to receive marketing updates.</string>
     <string name="update_downloaded">An update has just been downloaded.</string>
     <string name="restart">Restart</string>
+    <string name="get_rewarded">Get Rewarded</string>
+
+    <!-- Bonus airtime -->
+    <string name="bonus_airtime_applied">Bonus airtime will be applied.</string>
+    <string name="top_up">Top Up</string>
+    <string name="bonus_amount_label">Bonus Amount</string>
+    <string name="bonus_placeholder">Get 8% bonus when you buy airtime with Stax.</string>
+    <string name="valid_account_bonus_msg">You\’ll get credited at least 3% bonus airtime immediately after a successful purchase of Ksh 50 or more airtime.</string>
+    <string name="invalid_account_bonus_msg">Use your MPESA to buy airtime now and get instant 3%+ bonus.</string>
+    <string name="top_up_with_mpesa">Top up using Mpesa</string>
+    <string name="congratulations">Congratulations</string>
+    <string name="get_extra_airtime">Get Extra Airtime</string>
+    <string name="learn_more"><a href="https://stax.me/blog/airtime-bonuses-for-staxxers-in-kenya/">T&amp;Cs apply</a></string>
+
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7b7aae571..3045a4548 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -27,8 +27,8 @@
         <item name="textAllCaps">false</item>
     </style>
 
-    <style name="StaxOutlineButton" parent="Widget.Material3.Button.OutlinedButton">
-        <item name="android:radius">5dp</item>
+    <style name="StaxOutlineButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="shapeAppearance">@style/ShapeAppearance.Stax.MediumComponent</item>
         <item name="strokeColor">@color/grey</item>
         <item name="android:textColor">@color/offWhite</item>
         <item name="android:textAllCaps">false</item>
@@ -37,6 +37,11 @@
         <item name="android:fontFamily">@font/brutalista_medium</item>
     </style>
 
+    <style name="ShapeAppearance.Stax.MediumComponent" parent="ShapeAppearance.MaterialComponents.MediumComponent">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">16dp</item>
+    </style>
+
     <style name="StaxButtonColored" parent="StaxButton">
         <item name="android:textColor">@color/colorPrimaryDark</item>
         <item name="android:background">@drawable/button_bg_colored</item>
diff --git a/app/src/test/java/com/hover/stax/ExampleUnitTest.java b/app/src/test/java/com/hover/stax/ExampleUnitTest.java
index af386314e..896af0dad 100644
--- a/app/src/test/java/com/hover/stax/ExampleUnitTest.java
+++ b/app/src/test/java/com/hover/stax/ExampleUnitTest.java
@@ -1,9 +1,8 @@
 package com.hover.stax;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 /**
  * Example local unit test, which will execute on the development machine (host).
diff --git a/app/src/transsion/AndroidManifest.xml b/app/src/transsion/AndroidManifest.xml
index 4bacdca01..75d2f27b8 100644
--- a/app/src/transsion/AndroidManifest.xml
+++ b/app/src/transsion/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.hover.stax">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <meta-data android:name="AF_STORE" android:value="Transsion"/>
diff --git a/build.gradle b/build.gradle
index 09d78b136..712316202 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,10 +6,10 @@ buildscript {
 
     ext.kotlin_version = '1.6.10'
     ext.compose_version = '1.1.1'
-    ext.nav_version = "2.4.1"
+    ext.nav_version = "2.4.2"
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath 'com.google.gms:google-services:4.3.10'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -40,6 +40,9 @@ allprojects {
             authentication { basic(BasicAuthentication) }
             content { includeGroup "com.hover" }
         }
+        maven{
+            url 'https://sdk.uxcam.com/android/'
+        }
 
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8571de04d..d7d0ac0d7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 19 09:15:13 EAT 2021
+#Thu May 12 14:49:07 CAT 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+zipStoreBase=GRADLE_USER_HOME