diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index 64876d0..fb2442c 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -3,6 +3,11 @@
   <component name="WizardSettings">
     <option name="children">
       <map>
+        <entry key="imageWizard">
+          <value>
+            <PersistentState />
+          </value>
+        </entry>
         <entry key="vectorWizard">
           <value>
             <PersistentState>
@@ -30,8 +35,8 @@
                           <map>
                             <entry key="assetSourceType" value="FILE" />
                             <entry key="color" value="ffffff" />
-                            <entry key="outputName" value="ic_odyssey_wallet" />
-                            <entry key="sourceFile" value="$USER_HOME$/Downloads/Odyssey_Wallet.svg" />
+                            <entry key="outputName" value="ic_go" />
+                            <entry key="sourceFile" value="$USER_HOME$/Desktop/go.svg" />
                           </map>
                         </option>
                       </PersistentState>
diff --git a/.idea/navEditor.xml b/.idea/navEditor.xml
index ea57c56..8db8650 100644
--- a/.idea/navEditor.xml
+++ b/.idea/navEditor.xml
@@ -15,37 +15,17 @@
                   </entry>
                   <entry key="authFragment">
                     <value>
-                      <LayoutPositions>
-                        <option name="myPosition">
-                          <Point>
-                            <option name="x" value="305" />
-                            <option name="y" value="-142" />
-                          </Point>
-                        </option>
-                      </LayoutPositions>
+                      <LayoutPositions />
                     </value>
                   </entry>
                   <entry key="confirmFragment">
                     <value>
-                      <LayoutPositions>
-                        <option name="myPosition">
-                          <Point>
-                            <option name="x" value="581" />
-                            <option name="y" value="209" />
-                          </Point>
-                        </option>
-                      </LayoutPositions>
+                      <LayoutPositions />
                     </value>
                   </entry>
                   <entry key="signInFragment">
                     <value>
                       <LayoutPositions>
-                        <option name="myPosition">
-                          <Point>
-                            <option name="x" value="12" />
-                            <option name="y" value="54" />
-                          </Point>
-                        </option>
                         <option name="myPositions">
                           <map>
                             <entry key="action_signInFragment_to_authFragment">
@@ -66,12 +46,6 @@
                   <entry key="signupFragment">
                     <value>
                       <LayoutPositions>
-                        <option name="myPosition">
-                          <Point>
-                            <option name="x" value="305" />
-                            <option name="y" value="209" />
-                          </Point>
-                        </option>
                         <option name="myPositions">
                           <map>
                             <entry key="action_signupFragment_to_confirmFragment">
@@ -94,11 +68,26 @@
             <LayoutPositions>
               <option name="myPositions">
                 <map>
+                  <entry key="action_global_balance">
+                    <value>
+                      <LayoutPositions />
+                    </value>
+                  </entry>
+                  <entry key="action_global_confirmTransactionRequest">
+                    <value>
+                      <LayoutPositions />
+                    </value>
+                  </entry>
                   <entry key="action_global_showQR">
                     <value>
                       <LayoutPositions />
                     </value>
                   </entry>
+                  <entry key="action_global_splash">
+                    <value>
+                      <LayoutPositions />
+                    </value>
+                  </entry>
                   <entry key="balance">
                     <value>
                       <LayoutPositions>
@@ -132,13 +121,25 @@
                       </LayoutPositions>
                     </value>
                   </entry>
+                  <entry key="confirmTransactionRequest">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="12" />
+                            <option name="y" value="12" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
                   <entry key="profile">
                     <value>
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="11" />
-                            <option name="y" value="-102" />
+                            <option name="x" value="13" />
+                            <option name="y" value="-279" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -165,13 +166,25 @@
                       </LayoutPositions>
                     </value>
                   </entry>
+                  <entry key="splash">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="19" />
+                            <option name="y" value="970" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
                   <entry key="transactionList">
                     <value>
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="274" />
-                            <option name="y" value="-98" />
+                            <option name="x" value="280" />
+                            <option name="y" value="-278" />
                           </Point>
                         </option>
                       </LayoutPositions>
diff --git a/app/build.gradle b/app/build.gradle
index e38a9b9..b84354e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,6 +12,7 @@ Properties properties = new Properties()
 properties.load(project.rootProject.file('local.properties').newDataInputStream())
 def clientAPIKey = properties.getProperty('ewallet.apikey')
 def clientAPIBaseURL = properties.getProperty('ewallet.baseurl')
+def clientAPISocketBaseURL = properties.getProperty('ewallet.socket.baseurl')
 def clientEncryptKeyAlias = properties.getProperty('omg.encrypt.keyAlias')
 def clientEncryptIV = properties.getProperty('omg.encrypt.iv')
 def clientVerificationSignUpPrefix = properties.getProperty('ewallet.verification.signup.prefix')
@@ -31,6 +32,7 @@ android {
         debug {
             buildConfigField 'String', "CLIENT_API_KEY", clientAPIKey
             buildConfigField 'String', "CLIENT_API_BASE_URL", clientAPIBaseURL
+            buildConfigField 'String', "CLIENT_API_SOCKET_BASE_URL", clientAPISocketBaseURL
             buildConfigField 'String', "CLIENT_ENCRYPT_KEY_ALIAS", clientEncryptKeyAlias
             buildConfigField 'String', "CLIENT_ENCRYPT_IV", clientEncryptIV
             buildConfigField 'String', "CLIENT_VERIFICATION_SIGNUP_PREFIX", clientVerificationSignUpPrefix
@@ -40,6 +42,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             buildConfigField 'String', "CLIENT_API_KEY", clientAPIKey
             buildConfigField 'String', "CLIENT_API_BASE_URL", clientAPIBaseURL
+            buildConfigField 'String', "CLIENT_API_SOCKET_BASE_URL", clientAPISocketBaseURL
             buildConfigField 'String', "CLIENT_ENCRYPT_KEY_ALIAS", clientEncryptKeyAlias
             buildConfigField 'String', "CLIENT_ENCRYPT_IV", clientEncryptIV
             buildConfigField 'String', "CLIENT_VERIFICATION_SIGNUP_PREFIX", clientVerificationSignUpPrefix
@@ -105,6 +108,9 @@ dependencies {
     implementation firebase.core
     implementation firebase.crashlytics
 
+    /* Testing */
+    implementation custom.idlingResource
+
     testImplementation test
     androidTestImplementation androidTest
 }
diff --git a/app/gradleScript/dependencies.gradle b/app/gradleScript/dependencies.gradle
index 2c235f8..85b3996 100644
--- a/app/gradleScript/dependencies.gradle
+++ b/app/gradleScript/dependencies.gradle
@@ -8,8 +8,8 @@ allprojects {
 
 ext {
     /* Version */
-    appVersion = '1.1.0'
-    omisego = '1.1.1-alpha6'
+    appVersion = '2.0.0'
+    omisego = '1.1.2-alpha4'
     supportLibrary = '1.0.0-rc02'
     kotlin = '1.2.61'
     retrofit = '2.4.0'
@@ -18,6 +18,7 @@ ext {
     okhttp3 = '3.9.1'
     nav = '1.0.0-alpha06'
     architecture = "2.0.0-alpha1"
+    espresso = "3.1.0-alpha4"
 
     omisego = [
         sdk: "co.omisego:omisego-client:${omisego}",
@@ -27,7 +28,7 @@ ext {
         extensions: "androidx.lifecycle:lifecycle-extensions:${architecture}"
     ]
     firebase = [
-        core : "com.google.firebase:firebase-core:16.0.1",
+        core       : "com.google.firebase:firebase-core:16.0.1",
         crashlytics: "com.crashlytics.sdk.android:crashlytics:2.9.5"
     ]
     databinding = [
@@ -73,12 +74,12 @@ ext {
         "androidx.arch.core:core-testing:${architecture}"
     ]
     androidTest = [
-        "androidx.test.espresso:espresso-core:3.1.0-alpha4",
+        "androidx.test.espresso:espresso-core:${espresso}",
         "com.agoda.kakao:kakao:1.4.0-androidx",
         "com.android.support.test:runner:1.0.1",
         "org.amshove.kluent:kluent-android:1.30",
         "com.android.support.test:rules:1.0.1",
-        "com.jakewharton.espresso:okhttp3-idling-resource:1.0.0"
+        "com.jakewharton.espresso:okhttp3-idling-resource:1.0.0",
     ]
     custom = [
         constraintLayout: 'androidx.constraintlayout:constraintlayout:1.1.0',
@@ -86,6 +87,7 @@ ext {
         shimmer         : 'com.facebook.shimmer:shimmer:0.2.0',
         dexter          : 'com.karumi:dexter:5.0.0',
         biometric       : 'co.infinum:goldfinger:1.1.1',
-        pagerindicator  : 'com.romandanylyk:pageindicatorview:1.0.2'
+        pagerindicator  : 'com.romandanylyk:pageindicatorview:1.0.2',
+        idlingResource  : "androidx.test.espresso:espresso-idling-resource:${espresso}",
     ]
 }
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/BalanceDetailTest.kt b/app/src/androidTest/java/network/omisego/omgwallet/BalanceDetailTest.kt
new file mode 100644
index 0000000..e722b14
--- /dev/null
+++ b/app/src/androidTest/java/network/omisego/omgwallet/BalanceDetailTest.kt
@@ -0,0 +1,245 @@
+package network.omisego.omgwallet
+
+import androidx.test.runner.AndroidJUnit4
+import co.omisego.omisego.model.params.LoginParams
+import co.omisego.omisego.model.transaction.request.TransactionRequestParams
+import co.omisego.omisego.model.transaction.request.TransactionRequestType
+import com.agoda.kakao.KButton
+import network.omisego.omgwallet.base.BaseInstrumentalTest
+import network.omisego.omgwallet.config.LocalClientSetup
+import network.omisego.omgwallet.config.TestData
+import network.omisego.omgwallet.extension.logi
+import network.omisego.omgwallet.model.Credential
+import network.omisego.omgwallet.network.ClientProvider
+import network.omisego.omgwallet.screen.BalanceDetailScreen
+import network.omisego.omgwallet.screen.BalanceScreen
+import network.omisego.omgwallet.screen.MainScreen
+import network.omisego.omgwallet.storage.Storage
+import org.amshove.kluent.shouldEqual
+import org.amshove.kluent.shouldNotBe
+import org.amshove.kluent.shouldNotEqualTo
+import org.junit.After
+import org.junit.Before
+import org.junit.BeforeClass
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/*
+ * OmiseGO
+ *
+ * Created by Phuchit Sirimongkolsathien on 22/10/2018 AD.
+ * Copyright © 2017-2018 OmiseGO. All rights reserved.
+ */
+@RunWith(AndroidJUnit4::class)
+class BalanceDetailTest : BaseInstrumentalTest() {
+    private val mainScreen: MainScreen by lazy { MainScreen() }
+    private val balanceScreen: BalanceScreen by lazy { BalanceScreen() }
+    private val balanceDetailScreen: BalanceDetailScreen by lazy { BalanceDetailScreen() }
+
+    companion object {
+        @BeforeClass
+        @JvmStatic
+        fun setupClass() {
+            ClientProvider.init(LocalClientSetup())
+            Storage.clearSession()
+            val response = ClientProvider.client.login(LoginParams(TestData.USER_EMAIL, TestData.USER_PASSWORD)).execute()
+            Storage.saveUser(response.body()!!.data.user)
+            Storage.saveCredential(Credential(response.body()!!.data.authenticationToken))
+            Storage.saveUserEmail(TestData.USER_EMAIL)
+        }
+    }
+
+    @Before
+    fun setup() {
+        registerIdlingResource()
+        start()
+    }
+
+    @After
+    fun teardown() {
+        unregisterIdlingResource()
+    }
+
+    @Test
+    fun testBalanceDetailShouldBeDisplayedCorrectly() {
+        mainScreen {
+            bottomNavigation.isDisplayed()
+
+            val balances = Storage.loadWallets()?.data?.get(0)?.balances!!
+            val totalPage = balances.size
+            val firstToken = balances[0].token
+            val lastToken = balances[totalPage - 1].token
+
+            /* Click at first token */
+            balanceScreen {
+                recyclerView {
+                    firstChild<BalanceScreen.Item> {
+                        click()
+                    }
+                }
+            }
+
+            balanceDetailScreen {
+                viewpager.isDisplayed()
+                indicator.isDisplayed()
+                tvTokenPrimaryHelper.isDisplayed()
+
+                /* Verify page, token's symbol and balance amount */
+                viewpager {
+                    isAtPage(0)
+                    hasDescendant {
+                        withText(firstToken.symbol)
+                    }
+                    hasDescendant {
+                        withText(balances[0].displayAmount())
+                    }
+                }
+
+                pressBack()
+            }
+
+            /* Do the same thing with the last token */
+            balanceScreen {
+                recyclerView {
+                    swipeUp()
+                    lastChild<BalanceScreen.Item> {
+                        click()
+                    }
+                }
+            }
+
+            balanceDetailScreen {
+                viewpager.isDisplayed()
+                indicator.isDisplayed()
+                tvTokenPrimaryHelper.isDisplayed()
+
+                viewpager {
+                    isAtPage(totalPage - 1)
+                    hasDescendant {
+                        withText(lastToken.symbol)
+                    }
+                    hasDescendant {
+                        withText(balances[totalPage - 1].displayAmount())
+                    }
+                }
+
+                pressBack()
+            }
+        }
+    }
+
+    @Test
+    fun testBalanceDetailShouldBeSwipable() {
+        mainScreen {
+            bottomNavigation.isDisplayed()
+
+            /* Click at first token */
+            balanceScreen {
+                recyclerView {
+                    firstChild<BalanceScreen.Item> {
+                        click()
+                    }
+                }
+            }
+
+            balanceDetailScreen {
+                viewpager.isDisplayed()
+                indicator.isDisplayed()
+                tvTokenPrimaryHelper.isDisplayed()
+
+                viewpager {
+                    swipeLeft()
+                    isAtPage(1)
+                    swipeLeft()
+                    isAtPage(2)
+                    swipeRight()
+                    isAtPage(1)
+                    swipeRight()
+                    isAtPage(0)
+                }
+            }
+        }
+    }
+
+    @Test
+    fun testSetPrimaryToken() {
+        mainScreen {
+            bottomNavigation.isDisplayed()
+
+            /* Prepare data for verification */
+            val oldsFormattedIds = Storage.loadFormattedId()
+            val primaryTokenId = Storage.loadTokenPrimary()
+            val balances = Storage.loadWallets()?.data?.get(0)?.balances!!
+            val nextPrimaryBalance = balances.find { it.token.id != primaryTokenId }!!
+            val nextPrimaryBalanceIndex = balances.indexOfFirst { it.token.id == nextPrimaryBalance.token.id }
+
+            /* Go to balance detail page by clicking at the first token row */
+            balanceScreen {
+                recyclerView {
+                    childAt<BalanceScreen.Item>(nextPrimaryBalanceIndex) {
+                        click()
+                    }
+                }
+            }
+
+            balanceDetailScreen {
+
+                /* Verify there is a button with text "Set Primary" */
+                viewpager {
+                    hasDescendant {
+                        withText(stringRes(R.string.balance_detail_token_set_primary))
+                    }
+                }
+
+                /* Click the button "Set Primary" */
+                val btnSetPrimary = KButton {
+                    withId(R.id.btnSetPrimary)
+                    withSibling { withText(nextPrimaryBalance.token.symbol) }
+                }
+                btnSetPrimary.click()
+
+                /* Verify that tokenId should be changed */
+                primaryTokenId shouldNotBe Storage.loadTokenPrimary()
+
+                /* Verify that the button is disabled and change the text to "Primary" */
+                btnSetPrimary.isDisabled()
+                btnSetPrimary.hasText(R.string.balance_detail_token_primary)
+
+                /* Go back to balance list */
+                pressBack()
+            }
+
+            balanceScreen {
+                /* Verify that the small gray "Primary" indicator has set at the correct balance row */
+                recyclerView {
+                    childAt<BalanceScreen.Item>(nextPrimaryBalanceIndex) {
+                        tvCurrencyName.hasText(nextPrimaryBalance.token.name)
+                        tvPrimaryToken.isDisplayed()
+                    }
+                }
+
+                /* Verify new transaction request ids are generated */
+                val newFormattedIds = Storage.loadFormattedId()
+                oldsFormattedIds shouldNotEqualTo newFormattedIds
+
+                /* Verify the transaction request ids are correct */
+                val sendTxId = newFormattedIds.split("|")[1]
+                val receiveTxId = newFormattedIds.split("|")[0]
+                val sendTx = ClientProvider.client.retrieveTransactionRequest(TransactionRequestParams(sendTxId)).execute()
+                val receiveTx = ClientProvider.client.retrieveTransactionRequest(TransactionRequestParams(receiveTxId)).execute()
+
+                /* Prevent espresso stop the test by validate view (because the operation is coming from MessageQueue)*/
+                recyclerView.isDisplayed()
+
+                logi(sendTx.body()?.data)
+                logi(receiveTx.body()?.data)
+
+                /* verify transaction request type and token id are correct */
+                sendTx.body()?.data?.type shouldEqual TransactionRequestType.SEND
+                receiveTx.body()?.data?.type shouldEqual TransactionRequestType.RECEIVE
+                sendTx.body()?.data?.token?.id shouldEqual nextPrimaryBalance.token.id
+                receiveTx.body()?.data?.token?.id shouldEqual nextPrimaryBalance.token.id
+            }
+        }
+    }
+}
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/ConsumeTransactionRequestTest.kt b/app/src/androidTest/java/network/omisego/omgwallet/ConsumeTransactionRequestTest.kt
new file mode 100644
index 0000000..2dab764
--- /dev/null
+++ b/app/src/androidTest/java/network/omisego/omgwallet/ConsumeTransactionRequestTest.kt
@@ -0,0 +1,266 @@
+package network.omisego.omgwallet
+
+import androidx.test.runner.AndroidJUnit4
+import co.omisego.omisego.extension.bd
+import co.omisego.omisego.model.Balance
+import co.omisego.omisego.model.Token
+import co.omisego.omisego.model.params.LoginParams
+import co.omisego.omisego.model.transaction.consumption.TransactionConsumption
+import com.agoda.kakao.KView
+import network.omisego.omgwallet.base.BaseInstrumentalTest
+import network.omisego.omgwallet.config.LocalClientSetup
+import network.omisego.omgwallet.config.TestData
+import network.omisego.omgwallet.model.Credential
+import network.omisego.omgwallet.network.ClientProvider
+import network.omisego.omgwallet.screen.BalanceScreen
+import network.omisego.omgwallet.screen.ConfirmTransactionRequestScreen
+import network.omisego.omgwallet.screen.MainScreen
+import network.omisego.omgwallet.storage.Storage
+import org.junit.After
+import org.junit.Before
+import org.junit.BeforeClass
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.math.BigDecimal
+
+/*
+ * OmiseGO
+ *
+ * Created by Phuchit Sirimongkolsathien on 23/10/2018 AD.
+ * Copyright © 2017-2018 OmiseGO. All rights reserved.
+ */
+
+// To run the tests below, please make sure that the primary token has amount at least `2 * subunitToUnit`.
+// For example,
+// if the primary token is "OMG" which has subunitToUnit = 100, then the minimum `amount` to run tests is 200.
+
+@RunWith(AndroidJUnit4::class)
+class ConsumeTransactionRequestTest : BaseInstrumentalTest() {
+    private val mainScreen: MainScreen by lazy { MainScreen() }
+    private val balanceScreen: BalanceScreen by lazy { BalanceScreen() }
+    private val confirmTransactionRequestScreen: ConfirmTransactionRequestScreen by lazy { ConfirmTransactionRequestScreen() }
+
+    companion object {
+        @BeforeClass
+        @JvmStatic
+        fun setupClass() {
+            ClientProvider.init(LocalClientSetup())
+            Storage.clearSession()
+            val response = ClientProvider.client.login(LoginParams(TestData.USER_EMAIL, TestData.USER_PASSWORD)).execute()
+            Storage.saveUser(response.body()!!.data.user)
+            Storage.saveCredential(Credential(response.body()!!.data.authenticationToken))
+            Storage.saveUserEmail(TestData.USER_EMAIL)
+        }
+    }
+
+    @Before
+    fun setup() {
+        Storage.deleteTokenPrimary()
+        Storage.deleteFormattedIds()
+        registerIdlingResource()
+        start()
+    }
+
+    @After
+    fun teardown() {
+        unregisterIdlingResource()
+    }
+
+    @Test
+    fun testConsumeTransactionRequestWithTypeSend_ThenConfirmPageShouldBeDisplayedCorrectly() {
+        mainScreen {
+            bottomNavigation.isDisplayed()
+
+            /* Preparing test data */
+            val currentPrimaryTokenId = Storage.loadTokenPrimary()
+            val currentTxFormattedIds = Storage.loadFormattedId()
+            val currentTxFormattedIdSend = currentTxFormattedIds.split("|")[1]
+            val consumeToken: Token = Storage.loadWallets()?.data?.get(0)?.balances?.find { it.token.id == currentPrimaryTokenId }?.token!!
+
+            /* Consume transaction */
+            val txConsumption = consumeTx(consumeToken, currentTxFormattedIdSend)
+
+            idle(1000)
+
+            /* Verify confirmation screen data */
+            confirmTransactionRequestScreen {
+                tvTokenFrom {
+                    isDisplayed()
+                    hasText(stringRes(R.string.confirm_transaction_request_send))
+                }
+                tvTokenTo {
+                    isDisplayed()
+                    hasText("To ${txConsumption?.account?.name}")
+                }
+                tvAmount {
+                    isDisplayed()
+                    hasText("1.00 ${consumeToken.symbol}")
+                }
+                btnApprove.isDisplayed()
+                btnReject.isDisplayed()
+            }
+        }
+    }
+
+    @Test
+    fun testConsumeTransactionRequestWithTypeSend_doApprove_ThenBalanceScreenShouldBeDisplayCorrectly() {
+        mainScreen {
+            bottomNavigation.isDisplayed()
+
+            /* Preparing test data */
+            val currentPrimaryTokenId = Storage.loadTokenPrimary()
+            val currentTxFormattedIds = Storage.loadFormattedId()
+            val currentTxFormattedIdSend = currentTxFormattedIds.split("|")[1]
+            val currentBalance = Storage.loadWallets()?.data?.get(0)?.balances?.find { it.token.id == currentPrimaryTokenId }!!
+
+            /* Consume transaction */
+            consumeTx(currentBalance.token, currentTxFormattedIdSend)
+
+            idle(1000)
+
+            /* Verify confirmation screen data */
+            confirmTransactionRequestScreen {
+                tvTokenFrom.isDisplayed()
+                btnApprove {
+                    isDisplayed()
+                    click()
+                }
+            }
+
+            verifyBalanceHasChanged(
+                currentBalance = currentBalance,
+                expectedAmount = currentBalance.amount
+                    .minus(currentBalance.token.subunitToUnit)
+                    .divide(currentBalance.token.subunitToUnit)
+            )
+        }
+    }
+
+    @Test
+    fun testConsumeTransactionRequestWithTypeSend_doReject_ThenBalanceScreenShouldBeDisplayCorrectly() {
+        mainScreen {
+            bottomNavigation.isDisplayed()
+
+            /* Preparing test data */
+            val currentPrimaryTokenId = Storage.loadTokenPrimary()
+            val currentTxFormattedIds = Storage.loadFormattedId()
+            val currentTxFormattedIdSend = currentTxFormattedIds.split("|")[1]
+            val currentBalance = Storage.loadWallets()?.data?.get(0)?.balances?.find { it.token.id == currentPrimaryTokenId }!!
+
+            /* Consume transaction */
+            val txConsumption = consumeTx(currentBalance.token, currentTxFormattedIdSend)
+
+            idle(1000)
+
+            /* Verify confirmation screen data */
+            confirmTransactionRequestScreen {
+                tvTokenFrom.isDisplayed()
+                btnReject {
+                    isDisplayed()
+                    click()
+                }
+            }
+
+            verifyBalanceHasChanged(
+                currentBalance = currentBalance,
+                expectedAmount = currentBalance.amount.divide(currentBalance.token.subunitToUnit)
+            )
+
+            val toastText = KView {
+                withText(String.format(stringRes(R.string.notification_transaction_rejected), txConsumption?.account?.name))
+            }
+            toastText.isDisplayed()
+        }
+    }
+
+    @Test
+    fun testConsumeTransactionRequestWithTypeSend_doConsumeLargeAmount_ThenErrorShouldBeDisplayed() {
+        mainScreen {
+            bottomNavigation.isDisplayed()
+
+            /* Preparing test data */
+            val currentPrimaryTokenId = Storage.loadTokenPrimary()
+            val currentTxFormattedIds = Storage.loadFormattedId()
+            val currentTxFormattedIdSend = currentTxFormattedIds.split("|")[1]
+            val currentBalance = Storage.loadWallets()?.data?.get(0)?.balances?.find { it.token.id == currentPrimaryTokenId }!!
+
+            /* Consume transaction */
+            consumeTx(currentBalance.token, currentTxFormattedIdSend, largeAmount = true)
+
+            idle(1000)
+
+            /* Verify confirmation screen data */
+            confirmTransactionRequestScreen {
+                tvTokenFrom.isDisplayed()
+                btnApprove {
+                    isDisplayed()
+                    click()
+                }
+                tvErrorDescription {
+                    isDisplayed()
+                    hasText(
+                        String.format(
+                            stringRes(R.string.confirm_transaction_request_error_not_has_enough_fund),
+                            currentBalance.displayAmount(),
+                            currentBalance.token.symbol
+                        )
+                    )
+                }
+            }
+        }
+    }
+
+    @Test
+    fun testConsumeTransactionRequestWithTypeReceive_ThenBalanceScreenShouldBeDisplayedCorrectly() {
+        mainScreen {
+            bottomNavigation.isDisplayed()
+
+            /* Preparing test data */
+            val currentPrimaryTokenId = Storage.loadTokenPrimary()
+            val currentTxFormattedIds = Storage.loadFormattedId()
+            val currentTxFormattedIdReceive = currentTxFormattedIds.split("|")[0]
+            val currentBalance = Storage.loadWallets()?.data?.get(0)?.balances?.find { it.token.id == currentPrimaryTokenId }!!
+
+            /* Consume transaction */
+            consumeTx(currentBalance.token, currentTxFormattedIdReceive)
+
+            idle(1000)
+
+            verifyBalanceHasChanged(
+                currentBalance = currentBalance,
+                expectedAmount = currentBalance.amount
+                    .plus(currentBalance.token.subunitToUnit)
+                    .divide(currentBalance.token.subunitToUnit)
+            )
+        }
+    }
+
+    private fun verifyBalanceHasChanged(currentBalance: Balance, expectedAmount: BigDecimal) {
+        balanceScreen {
+            val tokenIndex = Storage.loadWallets()?.data?.get(0)?.balances?.indexOfFirst { currentBalance.token.id == it.token.id }!!
+            recyclerView {
+                isDisplayed()
+                childAt<BalanceScreen.Item>(tokenIndex) {
+                    val expectedAmountText = String.format("%,.2f", expectedAmount)
+                    idle(500)
+                    tvAmount.hasText(expectedAmountText)
+                }
+            }
+        }
+    }
+
+    private fun consumeTx(token: Token, formattedId: String, largeAmount: Boolean = false): TransactionConsumption? {
+        var consumeResponse: TransactionConsumption? = null
+        mainScreen {
+            bottomNavigation.isDisplayed()
+            consumeResponse = if (!largeAmount) {
+                consumerClient.consumeTxFormattedId(formattedId, token.subunitToUnit)
+            } else {
+                consumerClient.consumeTxFormattedId(formattedId, token.subunitToUnit * 100_000_000_000.bd)
+            }
+            bottomNavigation.isDisplayed()
+        }
+
+        return consumeResponse
+    }
+}
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/LoginTest.kt b/app/src/androidTest/java/network/omisego/omgwallet/LoginTest.kt
index 19fd590..b7f2a9d 100644
--- a/app/src/androidTest/java/network/omisego/omgwallet/LoginTest.kt
+++ b/app/src/androidTest/java/network/omisego/omgwallet/LoginTest.kt
@@ -23,7 +23,6 @@ import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class LoginTest : BaseInstrumentalTest() {
-
     private val loginScreen: LoginScreen by lazy { LoginScreen() }
     private val mainScreen: MainScreen by lazy { MainScreen() }
 
@@ -72,8 +71,6 @@ class LoginTest : BaseInstrumentalTest() {
             Storage.saveWallets(MockData.walletList)
             btnLogin.click()
             mainScreen {
-                bottomBarProfile.isDisplayed()
-                bottombarBalance.isDisplayed()
                 fabQR.isDisplayed()
             }
             with(sharedPreferences) {
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/MainTest.kt b/app/src/androidTest/java/network/omisego/omgwallet/MainTest.kt
index 817a2dd..18cf9f5 100644
--- a/app/src/androidTest/java/network/omisego/omgwallet/MainTest.kt
+++ b/app/src/androidTest/java/network/omisego/omgwallet/MainTest.kt
@@ -11,7 +11,6 @@ import androidx.test.runner.AndroidJUnit4
 import co.omisego.omisego.model.params.LoginParams
 import network.omisego.omgwallet.base.BaseInstrumentalTest
 import network.omisego.omgwallet.config.LocalClientSetup
-import network.omisego.omgwallet.config.MockData
 import network.omisego.omgwallet.config.TestData
 import network.omisego.omgwallet.model.Credential
 import network.omisego.omgwallet.network.ClientProvider
@@ -20,7 +19,8 @@ import network.omisego.omgwallet.screen.MainScreen
 import network.omisego.omgwallet.screen.ProfileScreen
 import network.omisego.omgwallet.screen.SplashScreen
 import network.omisego.omgwallet.storage.Storage
-import org.amshove.kluent.shouldEqual
+import org.amshove.kluent.shouldBeGreaterThan
+import org.amshove.kluent.shouldNotBe
 import org.junit.After
 import org.junit.Before
 import org.junit.BeforeClass
@@ -49,28 +49,27 @@ class MainTest : BaseInstrumentalTest() {
 
     @Before
     fun setup() {
+        Storage.deleteFormattedIds()
+        Storage.deleteTokenPrimary()
         registerIdlingResource()
-        Storage.saveWallets(MockData.walletList)
+        start()
     }
 
     @After
-    fun teardown(){
+    fun teardown() {
         unregisterIdlingResource()
     }
 
     @Test
     fun testShowMainBottomBar() {
-        start()
         mainScreen {
             fabQR.isDisplayed()
-            bottomBarProfile.isDisplayed()
-            bottombarBalance.isDisplayed()
+            bottomNavigation.isDisplayed()
         }
     }
 
     @Test
     fun testShowBalance() {
-        start()
         balanceScreen {
             recyclerView {
                 isDisplayed()
@@ -85,14 +84,13 @@ class MainTest : BaseInstrumentalTest() {
                 }
             }
         }
-        toolbarTitle shouldEqual "Balance"
+        hasToolbarTitle(stringRes(R.string.balance_title))
     }
 
     @Test
     fun testShowProfile() {
-        start()
-        mainScreen.bottomBarProfile.click()
-        toolbarTitle shouldEqual "Profile"
+        mainScreen.bottomNavigation.setSelectedItem(R.id.profile)
+        hasToolbarTitle(stringRes(R.string.profile_title))
         profileScreen {
             tvTransaction.isDisplayed()
             tvFingerprintTitle.isDisplayed()
@@ -100,15 +98,33 @@ class MainTest : BaseInstrumentalTest() {
         }
     }
 
+    @Test
+    fun testPrimaryTokenShouldBeVisibleWhenFirstTimeLogin() {
+        balanceScreen {
+            this.recyclerView.isDisplayed()
+
+            val primaryToken = selectPrimaryToken(Storage.loadWallets()!!, null)
+            val position = Storage.loadWallets()?.data?.get(0)?.balances?.indexOfFirst { it.token.id == primaryToken.id }
+
+            position shouldNotBe null
+            position?.shouldBeGreaterThan(-1)
+
+            recyclerView {
+                childAt<BalanceScreen.Item>(position!!) {
+                    tvPrimaryToken.isDisplayed()
+                }
+            }
+        }
+    }
+
     @Test
     fun testRepeatlySwitchTab() {
-        start()
         for (i in 0..1) {
-            mainScreen.bottomBarProfile.click()
-            toolbarTitle shouldEqual "Profile"
+            mainScreen.bottomNavigation.setSelectedItem(R.id.profile)
+            hasToolbarTitle(stringRes(R.string.profile_title))
             profileScreen.tvTransaction.isDisplayed()
-            mainScreen.bottombarBalance.click()
-            toolbarTitle shouldEqual "Balance"
+            mainScreen.bottomNavigation.setSelectedItem(R.id.balance)
+            hasToolbarTitle(stringRes(R.string.balance_title))
             balanceScreen.recyclerView.isDisplayed()
         }
     }
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/PrefetchTest.kt b/app/src/androidTest/java/network/omisego/omgwallet/PrefetchTest.kt
new file mode 100644
index 0000000..e4dfa27
--- /dev/null
+++ b/app/src/androidTest/java/network/omisego/omgwallet/PrefetchTest.kt
@@ -0,0 +1,100 @@
+package network.omisego.omgwallet
+
+/*
+ * OmiseGO
+ *
+ * Created by Phuchit Sirimongkolsathien on 21/10/2018 AD.
+ * Copyright © 2017-2018 OmiseGO. All rights reserved.
+ */
+
+import co.omisego.omisego.model.params.LoginParams
+import network.omisego.omgwallet.base.BaseInstrumentalTest
+import network.omisego.omgwallet.config.LocalClientSetup
+import network.omisego.omgwallet.config.TestData
+import network.omisego.omgwallet.model.Credential
+import network.omisego.omgwallet.network.ClientProvider
+import network.omisego.omgwallet.screen.MainScreen
+import network.omisego.omgwallet.screen.SplashScreen
+import network.omisego.omgwallet.storage.Storage
+import org.amshove.kluent.shouldBe
+import org.amshove.kluent.shouldBeGreaterThan
+import org.amshove.kluent.shouldEqual
+import org.amshove.kluent.shouldEqualTo
+import org.junit.After
+import org.junit.Before
+import org.junit.BeforeClass
+import org.junit.Test
+
+class PrefetchTest : BaseInstrumentalTest() {
+    private val splashScreen: SplashScreen by lazy { SplashScreen() }
+    private val mainScreen: MainScreen by lazy { MainScreen() }
+
+    companion object {
+        @BeforeClass
+        @JvmStatic
+        fun setupClass() {
+            Storage.clearSession()
+            ClientProvider.init(LocalClientSetup())
+            val response = ClientProvider.client.login(LoginParams(TestData.USER_EMAIL, TestData.USER_PASSWORD)).execute()
+            Storage.saveUser(response.body()!!.data.user)
+            Storage.saveCredential(Credential(response.body()!!.data.authenticationToken))
+            Storage.saveUserEmail(TestData.USER_EMAIL)
+        }
+    }
+
+    @Before
+    fun setup() {
+        Storage.deleteWallets()
+        Storage.deleteFormattedIds()
+    }
+
+    @After
+    fun teardown() {
+        unregisterIdlingResource()
+    }
+
+    @Test
+    fun testSplashScreenShouldDisplayCorrectly() {
+        start()
+        splashScreen {
+            loadingGif.isVisible()
+            tvStatus.isDisplayed()
+            btnClose.isNotDisplayed()
+        }
+    }
+
+    @Test
+    fun testSplashScreenShouldLoadWalletAndSaveCorrectly() {
+        registerIdlingResource()
+        start()
+
+        /* This will ensure that the test framework will be waiting for the idle state */
+        mainScreen.bottomNavigation.isDisplayed()
+        Storage.loadWallets()?.data?.size?.shouldBeGreaterThan(0)
+    }
+
+    @Test
+    fun testSplashScreenShouldCreateTransactionRequestAndSaveIdCorrectly() {
+        registerIdlingResource()
+        start()
+
+        /* Should create a transaction request and save the id with format `id1|id2` */
+        mainScreen.bottomNavigation.isDisplayed()
+        Storage.loadFormattedId().split("|").size shouldEqualTo 2
+    }
+
+    @Test
+    fun testSelectPrimaryTokenAutomaticallyWhenTheTokenPrimaryIdIsNull() {
+        /* Delete token primary first so that the primary token is null */
+        Storage.deleteTokenPrimary()
+
+        /* Verify that the token has already deleted */
+        Storage.loadTokenPrimary() shouldBe null
+
+        registerIdlingResource()
+        start()
+
+        mainScreen.bottomNavigation.isDisplayed()
+        selectPrimaryToken(Storage.loadWallets()!!, null).id shouldEqual Storage.loadTokenPrimary()
+    }
+}
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/ProfileTest.kt b/app/src/androidTest/java/network/omisego/omgwallet/ProfileTest.kt
index 35ccc78..ef084d1 100644
--- a/app/src/androidTest/java/network/omisego/omgwallet/ProfileTest.kt
+++ b/app/src/androidTest/java/network/omisego/omgwallet/ProfileTest.kt
@@ -12,7 +12,6 @@ import androidx.test.runner.AndroidJUnit4
 import co.omisego.omisego.model.params.LoginParams
 import network.omisego.omgwallet.base.BaseInstrumentalTest
 import network.omisego.omgwallet.config.LocalClientSetup
-import network.omisego.omgwallet.config.MockData
 import network.omisego.omgwallet.config.TestData
 import network.omisego.omgwallet.model.Credential
 import network.omisego.omgwallet.network.ClientProvider
@@ -23,7 +22,9 @@ import network.omisego.omgwallet.screen.ProfileScreen
 import network.omisego.omgwallet.storage.Storage
 import network.omisego.omgwallet.storage.StorageKey
 import org.amshove.kluent.shouldBe
+import org.junit.After
 import org.junit.Before
+import org.junit.BeforeClass
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -34,19 +35,32 @@ class ProfileTest : BaseInstrumentalTest() {
     private val loginScreen: LoginScreen by lazy { LoginScreen() }
     private val confirmFingerprintScreen: ConfirmFingerprintScreen by lazy { ConfirmFingerprintScreen() }
 
+    companion object {
+        @BeforeClass
+        @JvmStatic
+        fun setupClass() {
+            ClientProvider.init(LocalClientSetup())
+            Storage.clearSession()
+            val response = ClientProvider.client.login(LoginParams(TestData.USER_EMAIL, TestData.USER_PASSWORD)).execute()
+            Storage.saveUser(response.body()!!.data.user)
+            Storage.saveCredential(Credential(response.body()!!.data.authenticationToken))
+            Storage.saveUserEmail(TestData.USER_EMAIL)
+        }
+    }
+
     @Before
     fun setup() {
-        ClientProvider.init(LocalClientSetup())
-        Storage.clearSession()
-        val response = ClientProvider.client.login(LoginParams(TestData.USER_EMAIL, TestData.USER_PASSWORD)).execute()
-        Storage.saveWallets(MockData.walletList)
-        Storage.saveUser(response.body()!!.data.user)
-        Storage.saveCredential(Credential(response.body()!!.data.authenticationToken))
-        Storage.saveUserEmail(TestData.USER_EMAIL)
         Storage.deleteFingerprintCredential()
         Storage.saveFingerprintOption(false)
+        Storage.deleteFormattedIds()
+        registerIdlingResource()
         start()
-        mainScreen.bottomBarProfile.click()
+        mainScreen.bottomNavigation.setSelectedItem(R.id.profile)
+    }
+
+    @After
+    fun teardown() {
+        unregisterIdlingResource()
     }
 
     @Test
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/QRTest.kt b/app/src/androidTest/java/network/omisego/omgwallet/QRTest.kt
index fe729a3..27578bd 100644
--- a/app/src/androidTest/java/network/omisego/omgwallet/QRTest.kt
+++ b/app/src/androidTest/java/network/omisego/omgwallet/QRTest.kt
@@ -18,7 +18,7 @@ import network.omisego.omgwallet.network.ClientProvider
 import network.omisego.omgwallet.screen.MainScreen
 import network.omisego.omgwallet.screen.QRScreen
 import network.omisego.omgwallet.storage.Storage
-import org.amshove.kluent.shouldEqualTo
+import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -40,13 +40,19 @@ class QRTest : BaseInstrumentalTest() {
         Storage.deleteFingerprintCredential()
         Storage.saveFingerprintOption(false)
         start()
+        registerIdlingResource()
+    }
+
+    @After
+    fun teardown() {
+        unregisterIdlingResource()
     }
 
     @Test
     fun testShowQR() {
         mainScreen.fabQR.click()
         qrScreen {
-            toolbarTitle shouldEqualTo stringRes(R.string.show_qr_title)
+            hasToolbarTitle(stringRes(R.string.show_qr_title))
             ivQR {
                 isDisplayed()
             }
@@ -56,12 +62,12 @@ class QRTest : BaseInstrumentalTest() {
     @Test
     fun testCloseQR() {
         mainScreen.fabQR.click()
-        toolbarTitle shouldEqualTo stringRes(R.string.show_qr_title)
+        hasToolbarTitle(stringRes(R.string.show_qr_title))
         qrScreen.pressBack()
-        toolbarTitle shouldEqualTo stringRes(R.string.balance_title)
-        mainScreen.bottomBarProfile.click()
+        hasToolbarTitle(stringRes(R.string.balance_title))
+        mainScreen.bottomNavigation.setSelectedItem(R.id.profile)
         mainScreen.fabQR.click()
         qrScreen.pressBack()
-        toolbarTitle shouldEqualTo stringRes(R.string.profile_title)
+        hasToolbarTitle(stringRes(R.string.profile_title))
     }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/TransactionListTest.kt b/app/src/androidTest/java/network/omisego/omgwallet/TransactionListTest.kt
index b82ab97..5fdf644 100644
--- a/app/src/androidTest/java/network/omisego/omgwallet/TransactionListTest.kt
+++ b/app/src/androidTest/java/network/omisego/omgwallet/TransactionListTest.kt
@@ -52,7 +52,7 @@ class TransactionListTest : BaseInstrumentalTest() {
     @Test
     fun testShowTransactionList() {
         mainScreen {
-            bottomBarProfile.click()
+            bottomNavigation.setSelectedItem(R.id.profile)
         }
         profileScreen {
             tvTransaction.click()
@@ -66,15 +66,9 @@ class TransactionListTest : BaseInstrumentalTest() {
 
     @Test
     fun testCloseTransactionList() {
-        mainScreen {
-            bottomBarProfile.click()
-        }
-        profileScreen {
-            tvTransaction.click()
-        }
-        transactionListScreen {
-            backButton.click()
-        }
+        mainScreen.bottomNavigation.setSelectedItem(R.id.profile)
+        profileScreen.tvTransaction.click()
+        mainScreen.pressBack()
         profileScreen {
             tvTransaction.isDisplayed()
             tvFingerprintTitle.isDisplayed()
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/base/BaseInstrumentalTest.kt b/app/src/androidTest/java/network/omisego/omgwallet/base/BaseInstrumentalTest.kt
index 12890c0..bced930 100644
--- a/app/src/androidTest/java/network/omisego/omgwallet/base/BaseInstrumentalTest.kt
+++ b/app/src/androidTest/java/network/omisego/omgwallet/base/BaseInstrumentalTest.kt
@@ -8,13 +8,20 @@ import androidx.test.InstrumentationRegistry
 import androidx.test.espresso.IdlingRegistry
 import androidx.test.rule.ActivityTestRule
 import co.infinum.goldfinger.Goldfinger
+import co.omisego.omisego.model.Balance
+import co.omisego.omisego.model.Token
+import co.omisego.omisego.model.WalletList
 import com.jakewharton.espresso.OkHttp3IdlingResource
 import network.omisego.omgwallet.MainActivity
 import network.omisego.omgwallet.R
 import network.omisego.omgwallet.config.LocalClientSetup
+import network.omisego.omgwallet.config.TxConsumerClient
 import network.omisego.omgwallet.network.ClientProvider
+import network.omisego.omgwallet.screen.MainScreen
 import network.omisego.omgwallet.util.ContextUtil
+import network.omisego.omgwallet.util.IdlingResourceUtil
 import org.junit.Rule
+import java.math.BigDecimal
 
 /*
  * OmiseGO
@@ -23,10 +30,20 @@ import org.junit.Rule
  * Copyright © 2017-2018 OmiseGO. All rights reserved.
  */
 open class BaseInstrumentalTest {
-    private val idlingResource by lazy {
+    val consumerClient by lazy {
+        TxConsumerClient.create()
+    }
+
+    val idlingResource by lazy {
         OkHttp3IdlingResource.create("OkHTTP", ClientProvider.eWalletClient.client)
     }
 
+    val consumerIdlingResource by lazy {
+        OkHttp3IdlingResource.create("OkHTTPConsumer", consumerClient.okHttpClient)
+    }
+
+    private val mainScreen: MainScreen by lazy { MainScreen() }
+
     @Rule
     @JvmField
     val rule = ActivityTestRule(MainActivity::class.java, true, false)
@@ -36,8 +53,9 @@ open class BaseInstrumentalTest {
         context.getSharedPreferences(context.getString(R.string.app_name), Context.MODE_PRIVATE)
     }
 
-    val toolbarTitle: String
-        get() = rule.activity.supportActionBar?.title!!.toString()
+    fun hasToolbarTitle(title: String) {
+        mainScreen.toolbar.hasTitle(title)
+    }
 
     fun clearSharePreference() {
         sharedPreferences.edit().clear().apply()
@@ -47,10 +65,21 @@ open class BaseInstrumentalTest {
 
     fun registerIdlingResource() {
         IdlingRegistry.getInstance().register(idlingResource)
+        IdlingRegistry.getInstance().register(consumerIdlingResource)
+        IdlingRegistry.getInstance().register(IdlingResourceUtil.idlingResource)
     }
 
     fun unregisterIdlingResource() {
         IdlingRegistry.getInstance().unregister(idlingResource)
+        IdlingRegistry.getInstance().unregister(consumerIdlingResource)
+        IdlingRegistry.getInstance().unregister(IdlingResourceUtil.idlingResource)
+    }
+
+    fun selectPrimaryToken(walletList: WalletList, primaryTokenId: String?): Token {
+        val theHighestBalance: (Balance) -> BigDecimal = { it.amount.divide(it.token.subunitToUnit) }
+        return walletList.data[0].balances.find { it.token.id == primaryTokenId }?.token
+            ?: walletList.data[0].balances.maxBy(theHighestBalance)?.token
+            ?: walletList.data[0].balances[0].token
     }
 
     fun stringRes(@StringRes id: Int): String {
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/config/LocalClientSetup.kt b/app/src/androidTest/java/network/omisego/omgwallet/config/LocalClientSetup.kt
index 764ed1c..6d20886 100644
--- a/app/src/androidTest/java/network/omisego/omgwallet/config/LocalClientSetup.kt
+++ b/app/src/androidTest/java/network/omisego/omgwallet/config/LocalClientSetup.kt
@@ -12,6 +12,8 @@ import network.omisego.omgwallet.network.ClientSetup
 class LocalClientSetup : ClientSetup {
     override val baseURL: String
         get() = "https://coffeego.omisego.io/api/client/" // Special ip-address for local machine in the emulator
+    override val socketBaseURL: String
+        get() = "wss://coffeego.omisego.io/api/client/socket/"
     override val apiKey: String
         get() = "fxqhJomqeemaAomNyfH_RphsVx4D2Z0ruBo_g-3jCY4"
 }
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/config/TestData.kt b/app/src/androidTest/java/network/omisego/omgwallet/config/TestData.kt
index 78af8fd..6195ed7 100644
--- a/app/src/androidTest/java/network/omisego/omgwallet/config/TestData.kt
+++ b/app/src/androidTest/java/network/omisego/omgwallet/config/TestData.kt
@@ -13,5 +13,8 @@ object TestData {
     const val USER_EMAIL = "ripzery@gmail.com"
     const val USER_PASSWORD = "Tt123###"
 
-    val REGISTER_USER_EMAIL = "test${UUID.randomUUID().toString().take(3)}@omise.co"
+    const val CONSUME_TX_USER_EMAIL = "phuchit.sir@gmail.com"
+    const val CONSUME_TX_USER_PASSWORD = "Tt123###"
+
+    val REGISTER_USER_EMAIL = "test${UUID.randomUUID().toString().take(5)}@omise.co"
 }
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/config/TxConsumerClient.kt b/app/src/androidTest/java/network/omisego/omgwallet/config/TxConsumerClient.kt
new file mode 100644
index 0000000..477b027
--- /dev/null
+++ b/app/src/androidTest/java/network/omisego/omgwallet/config/TxConsumerClient.kt
@@ -0,0 +1,53 @@
+package network.omisego.omgwallet.config
+
+import co.omisego.omisego.OMGAPIClient
+import co.omisego.omisego.extension.bd
+import co.omisego.omisego.model.ClientAuthenticationToken
+import co.omisego.omisego.model.ClientConfiguration
+import co.omisego.omisego.model.params.LoginParams
+import co.omisego.omisego.model.transaction.consumption.TransactionConsumption
+import co.omisego.omisego.model.transaction.consumption.TransactionConsumptionParams
+import co.omisego.omisego.model.transaction.request.TransactionRequestParams
+import co.omisego.omisego.network.ewallet.EWalletClient
+import okhttp3.OkHttpClient
+import java.math.BigDecimal
+
+/*
+ * OmiseGO
+ *
+ * Created by Phuchit Sirimongkolsathien on 23/10/2018 AD.
+ * Copyright © 2017-2018 OmiseGO. All rights reserved.
+ */
+
+class TxConsumerClient(val client: OMGAPIClient, val okHttpClient: OkHttpClient) {
+
+    fun login(): ClientAuthenticationToken? {
+        val credential = client.login(LoginParams(TestData.CONSUME_TX_USER_EMAIL, TestData.CONSUME_TX_USER_PASSWORD)).execute().body()
+        return credential?.data
+    }
+
+    fun consumeTxFormattedId(formattedId: String, amount: BigDecimal = 100.bd): TransactionConsumption? {
+        val tx = client.retrieveTransactionRequest(TransactionRequestParams(formattedId)).execute().body()?.data
+        val consumeResponse = client.consumeTransactionRequest(TransactionConsumptionParams.create(tx!!, amount)).execute().body()?.data
+        return consumeResponse
+    }
+
+    companion object {
+        fun create(): TxConsumerClient {
+            val clientSetup = LocalClientSetup()
+            val configuration = ClientConfiguration(
+                clientSetup.baseURL,
+                clientSetup.apiKey
+            )
+
+            val eWalletClient = EWalletClient.Builder {
+                clientConfiguration = configuration
+                debug = true
+            }.build()
+
+            val txConsumerClient = TxConsumerClient(OMGAPIClient(eWalletClient), eWalletClient.client)
+            txConsumerClient.login()
+            return txConsumerClient
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/custom/KToolbar.kt b/app/src/androidTest/java/network/omisego/omgwallet/custom/KToolbar.kt
new file mode 100644
index 0000000..25b73f4
--- /dev/null
+++ b/app/src/androidTest/java/network/omisego/omgwallet/custom/KToolbar.kt
@@ -0,0 +1,21 @@
+package network.omisego.omgwallet.custom
+
+import android.view.View
+import androidx.test.espresso.DataInteraction
+import com.agoda.kakao.KBaseView
+import com.agoda.kakao.ViewBuilder
+import network.omisego.omgwallet.custom.assertions.ToolbarAssertion
+import org.hamcrest.Matcher
+
+/*
+ * OmiseGO
+ *
+ * Created by Phuchit Sirimongkolsathien on 6/10/2018 AD.
+ * Copyright © 2017-2018 OmiseGO. All rights reserved.
+ */
+
+class KToolbar : KBaseView<KToolbar>, ToolbarAssertion {
+    constructor(function: ViewBuilder.() -> Unit) : super(function)
+    constructor(parent: Matcher<View>, function: ViewBuilder.() -> Unit) : super(parent, function)
+    constructor(parent: DataInteraction, function: ViewBuilder.() -> Unit) : super(parent, function)
+}
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/custom/assertions/ToolbarAssertion.kt b/app/src/androidTest/java/network/omisego/omgwallet/custom/assertions/ToolbarAssertion.kt
new file mode 100644
index 0000000..aa0187d
--- /dev/null
+++ b/app/src/androidTest/java/network/omisego/omgwallet/custom/assertions/ToolbarAssertion.kt
@@ -0,0 +1,18 @@
+package network.omisego.omgwallet.custom.assertions
+
+import androidx.test.espresso.assertion.ViewAssertions
+import com.agoda.kakao.BaseAssertions
+import network.omisego.omgwallet.custom.matchers.ToolbarMatcher
+
+/*
+ * OmiseGO
+ *
+ * Created by Phuchit Sirimongkolsathien on 22/10/2018 AD.
+ * Copyright © 2017-2018 OmiseGO. All rights reserved.
+ */
+
+interface ToolbarAssertion : BaseAssertions {
+    fun hasTitle(title: String) {
+        view.check(ViewAssertions.matches(ToolbarMatcher(title)))
+    }
+}
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/custom/matchers/ToolbarMatcher.kt b/app/src/androidTest/java/network/omisego/omgwallet/custom/matchers/ToolbarMatcher.kt
new file mode 100644
index 0000000..2680b40
--- /dev/null
+++ b/app/src/androidTest/java/network/omisego/omgwallet/custom/matchers/ToolbarMatcher.kt
@@ -0,0 +1,24 @@
+package network.omisego.omgwallet.custom.matchers
+
+import androidx.appcompat.widget.Toolbar
+import androidx.test.espresso.matcher.BoundedMatcher
+import org.hamcrest.Description
+
+/*
+ * OmiseGO
+ *
+ * Created by Phuchit Sirimongkolsathien on 22/10/2018 AD.
+ * Copyright © 2017-2018 OmiseGO. All rights reserved.
+ */
+
+class ToolbarMatcher(
+    private val title: String
+) : BoundedMatcher<Any, Toolbar>(Toolbar::class.java) {
+    override fun describeTo(description: Description?) {
+        description?.appendText("with toolbar title: $title")
+    }
+
+    override fun matchesSafely(toolbar: Toolbar?): Boolean {
+        return title == toolbar?.title
+    }
+}
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/screen/BalanceDetailScreen.kt b/app/src/androidTest/java/network/omisego/omgwallet/screen/BalanceDetailScreen.kt
new file mode 100644
index 0000000..a1e7590
--- /dev/null
+++ b/app/src/androidTest/java/network/omisego/omgwallet/screen/BalanceDetailScreen.kt
@@ -0,0 +1,27 @@
+package network.omisego.omgwallet.screen
+
+import com.agoda.kakao.KTextView
+import com.agoda.kakao.KView
+import com.agoda.kakao.KViewPager
+import com.agoda.kakao.Screen
+import network.omisego.omgwallet.R
+
+/*
+ * OmiseGO
+ *
+ * Created by Phuchit Sirimongkolsathien on 22/10/2018 AD.
+ * Copyright © 2017-2018 OmiseGO. All rights reserved.
+ */
+class BalanceDetailScreen : Screen<BalanceDetailScreen>() {
+    val viewpager: KViewPager = KViewPager {
+        withId(R.id.viewpager)
+    }
+
+    val tvTokenPrimaryHelper: KTextView = KTextView {
+        withId(R.id.tvTokenPrimaryHelper)
+    }
+
+    val indicator: KView = KView {
+        withId(R.id.pageIndicatorView)
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/screen/BalanceScreen.kt b/app/src/androidTest/java/network/omisego/omgwallet/screen/BalanceScreen.kt
index 6dee815..cffba0d 100644
--- a/app/src/androidTest/java/network/omisego/omgwallet/screen/BalanceScreen.kt
+++ b/app/src/androidTest/java/network/omisego/omgwallet/screen/BalanceScreen.kt
@@ -26,5 +26,6 @@ class BalanceScreen : Screen<BalanceScreen>() {
         val tvCurrencyName: KTextView = KTextView(parent) { withId(R.id.tvCurrencyName) }
         val tvAmount: KTextView = KTextView(parent) { withId(R.id.tvAmount) }
         val tvCurrencySymbol: KTextView = KTextView(parent) { withId(R.id.tvCurrencySymbol) }
+        val tvPrimaryToken: KTextView = KTextView(parent) { withId(R.id.tvPrimary) }
     }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/screen/ConfirmTransactionRequestScreen.kt b/app/src/androidTest/java/network/omisego/omgwallet/screen/ConfirmTransactionRequestScreen.kt
new file mode 100644
index 0000000..f70d072
--- /dev/null
+++ b/app/src/androidTest/java/network/omisego/omgwallet/screen/ConfirmTransactionRequestScreen.kt
@@ -0,0 +1,39 @@
+package network.omisego.omgwallet.screen
+
+import com.agoda.kakao.KButton
+import com.agoda.kakao.KTextView
+import com.agoda.kakao.Screen
+import network.omisego.omgwallet.R
+
+/*
+ * OmiseGO
+ *
+ * Created by Phuchit Sirimongkolsathien on 23/10/2018 AD.
+ * Copyright © 2017-2018 OmiseGO. All rights reserved.
+ */
+
+class ConfirmTransactionRequestScreen : Screen<ConfirmTransactionRequestScreen>() {
+    val tvTokenFrom: KTextView = KTextView {
+        withId(R.id.tvTokenFrom)
+    }
+
+    val tvAmount: KTextView = KTextView {
+        withId(R.id.tvAmount)
+    }
+
+    val tvTokenTo: KTextView = KTextView {
+        withId(R.id.tvTokenTo)
+    }
+
+    val tvErrorDescription: KTextView = KTextView {
+        withId(R.id.tvErrorDescription)
+    }
+
+    val btnReject: KButton = KButton {
+        withId(R.id.btnReject)
+    }
+
+    val btnApprove: KButton = KButton {
+        withId(R.id.btnApprove)
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/screen/MainScreen.kt b/app/src/androidTest/java/network/omisego/omgwallet/screen/MainScreen.kt
index 8568bd6..06e0bd5 100644
--- a/app/src/androidTest/java/network/omisego/omgwallet/screen/MainScreen.kt
+++ b/app/src/androidTest/java/network/omisego/omgwallet/screen/MainScreen.kt
@@ -1,8 +1,10 @@
 package network.omisego.omgwallet.screen
 
+import com.agoda.kakao.KBottomNavigationView
 import com.agoda.kakao.KView
 import com.agoda.kakao.Screen
 import network.omisego.omgwallet.R
+import network.omisego.omgwallet.custom.KToolbar
 
 /*
  * OmiseGO
@@ -12,12 +14,14 @@ import network.omisego.omgwallet.R
  */
 
 class MainScreen : Screen<MainScreen>() {
-    val bottombarBalance: KView = KView {
-        withId(R.id.bottomBarBalance)
+    val toolbar: KToolbar = KToolbar {
+        withId(R.id.toolbar)
     }
-    val bottomBarProfile: KView = KView {
-        withId(R.id.bottomBarProfile)
+
+    val bottomNavigation: KBottomNavigationView = KBottomNavigationView {
+        withId(R.id.bottomNavigation)
     }
+
     val fabQR: KView = KView {
         withId(R.id.fabQR)
     }
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/screen/SplashScreen.kt b/app/src/androidTest/java/network/omisego/omgwallet/screen/SplashScreen.kt
index 40e4596..e87dbe4 100644
--- a/app/src/androidTest/java/network/omisego/omgwallet/screen/SplashScreen.kt
+++ b/app/src/androidTest/java/network/omisego/omgwallet/screen/SplashScreen.kt
@@ -1,6 +1,8 @@
 package network.omisego.omgwallet.screen
 
+import com.agoda.kakao.KButton
 import com.agoda.kakao.KImageView
+import com.agoda.kakao.KTextView
 import com.agoda.kakao.Screen
 import network.omisego.omgwallet.R
 
@@ -16,4 +18,12 @@ class SplashScreen : Screen<SplashScreen>() {
     val loadingGif: KImageView = KImageView {
         withId(R.id.imageView)
     }
+
+    val tvStatus: KTextView = KTextView {
+        withId(R.id.tvCurrentStatus)
+    }
+
+    val btnClose: KButton = KButton {
+        withId(R.id.btnClose)
+    }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/network/omisego/omgwallet/screen/TransactionListScreen.kt b/app/src/androidTest/java/network/omisego/omgwallet/screen/TransactionListScreen.kt
index 194b49d..d006955 100644
--- a/app/src/androidTest/java/network/omisego/omgwallet/screen/TransactionListScreen.kt
+++ b/app/src/androidTest/java/network/omisego/omgwallet/screen/TransactionListScreen.kt
@@ -4,7 +4,6 @@ import android.view.View
 import com.agoda.kakao.KRecyclerItem
 import com.agoda.kakao.KRecyclerView
 import com.agoda.kakao.KTextView
-import com.agoda.kakao.KView
 import com.agoda.kakao.Screen
 import network.omisego.omgwallet.R
 import org.hamcrest.Matcher
@@ -16,10 +15,6 @@ import org.hamcrest.Matcher
  * Copyright © 2017-2018 OmiseGO. All rights reserved.
  */
 class TransactionListScreen : Screen<TransactionListScreen>() {
-    val backButton: KView = KView {
-        withDrawable(R.drawable.ic_arrow_back)
-    }
-
     val recyclerView: KRecyclerView = KRecyclerView({
         withId(R.id.recyclerView)
     }, {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0d53f79..081e7c8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/OMGTheme"
+        android:theme="@style/SplashTheme"
         tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name="network.omisego.omgwallet.MainActivity"
diff --git a/app/src/main/java/network/omisego/omgwallet/AndroidViewModelFactory.kt b/app/src/main/java/network/omisego/omgwallet/AndroidViewModelFactory.kt
index 88dc40d..dbcd4c1 100644
--- a/app/src/main/java/network/omisego/omgwallet/AndroidViewModelFactory.kt
+++ b/app/src/main/java/network/omisego/omgwallet/AndroidViewModelFactory.kt
@@ -15,10 +15,12 @@ import network.omisego.omgwallet.data.LocalRepository
 import network.omisego.omgwallet.data.RemoteRepository
 import network.omisego.omgwallet.screen.auth.balance.detail.BalanceDetailItemViewModel
 import network.omisego.omgwallet.screen.auth.balance.detail.BalanceDetailViewModel
+import network.omisego.omgwallet.screen.auth.confirm.ConfirmTransactionRequestViewModel
 import network.omisego.omgwallet.screen.auth.profile.main.ProfileViewModel
 import network.omisego.omgwallet.screen.auth.profile.transaction.TransactionListTransformer
 import network.omisego.omgwallet.screen.auth.profile.transaction.TransactionListViewModel
 import network.omisego.omgwallet.screen.auth.showqr.ShowQRViewModel
+import network.omisego.omgwallet.screen.auth.splash.PreloadResourceViewModel
 import network.omisego.omgwallet.screen.unauth.signin.FingerprintBottomSheetViewModel
 import network.omisego.omgwallet.screen.unauth.signin.SignInViewModel
 import network.omisego.omgwallet.util.BiometricUtil
@@ -34,7 +36,7 @@ class AndroidViewModelFactory(private val application: Application) : ViewModelP
                 FingerprintBottomSheetViewModel(application) as T
             }
             modelClass.isAssignableFrom(ProfileViewModel::class.java) -> {
-                return ProfileViewModel(application, LocalRepository()) as T
+                return ProfileViewModel(application, LocalRepository(), RemoteRepository()) as T
             }
             modelClass.isAssignableFrom(TransactionListViewModel::class.java) -> {
                 return TransactionListViewModel(application, LocalRepository(), RemoteRepository(), TransactionListTransformer(application)) as T
@@ -48,6 +50,12 @@ class AndroidViewModelFactory(private val application: Application) : ViewModelP
             modelClass.isAssignableFrom(BalanceDetailViewModel::class.java) -> {
                 return BalanceDetailViewModel(application, LocalRepository()) as T
             }
+            modelClass.isAssignableFrom(PreloadResourceViewModel::class.java) -> {
+                return PreloadResourceViewModel(application, LocalRepository(), RemoteRepository()) as T
+            }
+            modelClass.isAssignableFrom(ConfirmTransactionRequestViewModel::class.java) -> {
+                return ConfirmTransactionRequestViewModel(application, LocalRepository(), RemoteRepository()) as T
+            }
             else -> {
                 throw IllegalArgumentException("Unknown ViewModel class: ${modelClass.name}")
             }
diff --git a/app/src/main/java/network/omisego/omgwallet/MainActivity.kt b/app/src/main/java/network/omisego/omgwallet/MainActivity.kt
index 6eae6eb..841c3bf 100644
--- a/app/src/main/java/network/omisego/omgwallet/MainActivity.kt
+++ b/app/src/main/java/network/omisego/omgwallet/MainActivity.kt
@@ -8,6 +8,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setTheme(R.style.OMGTheme)
         setContentView(R.layout.activity_main)
     }
 
diff --git a/app/src/main/java/network/omisego/omgwallet/ViewModelFactory.kt b/app/src/main/java/network/omisego/omgwallet/ViewModelFactory.kt
index a0c2c00..7b89051 100644
--- a/app/src/main/java/network/omisego/omgwallet/ViewModelFactory.kt
+++ b/app/src/main/java/network/omisego/omgwallet/ViewModelFactory.kt
@@ -11,9 +11,9 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import network.omisego.omgwallet.data.LocalRepository
 import network.omisego.omgwallet.data.RemoteRepository
+import network.omisego.omgwallet.screen.auth.MainViewModel
 import network.omisego.omgwallet.screen.auth.balance.BalanceViewModel
 import network.omisego.omgwallet.screen.auth.profile.main.ConfirmFingerprintViewModel
-import network.omisego.omgwallet.screen.auth.splash.PreloadResourceViewModel
 import network.omisego.omgwallet.screen.unauth.signup.SignupViewModel
 
 @Suppress("UNCHECKED_CAST")
@@ -23,15 +23,15 @@ class ViewModelFactory : ViewModelProvider.NewInstanceFactory() {
             modelClass.isAssignableFrom(SignupViewModel::class.java) -> {
                 return SignupViewModel(RemoteRepository()) as T
             }
-            modelClass.isAssignableFrom(PreloadResourceViewModel::class.java) -> {
-                return PreloadResourceViewModel(LocalRepository(), RemoteRepository()) as T
-            }
             modelClass.isAssignableFrom(BalanceViewModel::class.java) -> {
                 return BalanceViewModel(LocalRepository(), RemoteRepository()) as T
             }
             modelClass.isAssignableFrom(ConfirmFingerprintViewModel::class.java) -> {
                 return ConfirmFingerprintViewModel(LocalRepository(), RemoteRepository()) as T
             }
+            modelClass.isAssignableFrom(MainViewModel::class.java) -> {
+                return MainViewModel(LocalRepository(), RemoteRepository()) as T
+            }
             else -> {
                 throw IllegalArgumentException("Unknown ViewModel class: ${modelClass.name}")
             }
diff --git a/app/src/main/java/network/omisego/omgwallet/base/LoadingRecyclerAdapter.kt b/app/src/main/java/network/omisego/omgwallet/base/LoadingRecyclerAdapter.kt
index a6b04f0..f8f0cb1 100644
--- a/app/src/main/java/network/omisego/omgwallet/base/LoadingRecyclerAdapter.kt
+++ b/app/src/main/java/network/omisego/omgwallet/base/LoadingRecyclerAdapter.kt
@@ -7,6 +7,7 @@ package network.omisego.omgwallet.base
  * Copyright © 2017-2018 OmiseGO. All rights reserved.
  */
 
+import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.annotation.LayoutRes
@@ -14,6 +15,8 @@ import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
+import network.omisego.omgwallet.custom.LoadingDiffCallback
+import network.omisego.omgwallet.extension.logi
 import java.util.UUID
 
 class LoadingRecyclerAdapter<T : Any, V : ViewDataBinding>(
@@ -32,6 +35,9 @@ class LoadingRecyclerAdapter<T : Any, V : ViewDataBinding>(
         contentLoadingList.addAll(contentList)
     }
 
+    fun changeItem(item: T) {
+    }
+
     fun reloadItems(newContentItems: List<T>) {
         contentList.clear()
         contentList.addAll(newContentItems)
@@ -99,6 +105,18 @@ class LoadingRecyclerAdapter<T : Any, V : ViewDataBinding>(
             }
         }
     }
+
+    override fun onBindViewHolder(holder: StateViewHolder, position: Int, payloads: MutableList<Any>) {
+        if (payloads.isEmpty()) this.onBindViewHolder(holder, position)
+        else {
+            val bundle = payloads[0] as Bundle
+            if (holder is StateViewHolder.Show<*>) {
+                val data = stateViewHolderBinding.resolvePayloadBundle(bundle) ?: return
+                logi("onBindViewHolder With Payload: $data")
+                stateViewHolderBinding.bind((holder as StateViewHolder.Show<V>).binding, data)
+            }
+        }
+    }
 }
 
 interface UpdateAdapterDispatcher<T> {
diff --git a/app/src/main/java/network/omisego/omgwallet/base/StateViewHolder.kt b/app/src/main/java/network/omisego/omgwallet/base/StateViewHolder.kt
index c28c6d2..f070a63 100644
--- a/app/src/main/java/network/omisego/omgwallet/base/StateViewHolder.kt
+++ b/app/src/main/java/network/omisego/omgwallet/base/StateViewHolder.kt
@@ -11,7 +11,7 @@ import android.view.View
 import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.RecyclerView
 
-sealed class StateViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+sealed class StateViewHolder(val itemView: View) : RecyclerView.ViewHolder(itemView) {
     class Loading(itemView: View) : StateViewHolder(itemView)
     class Show<T : ViewDataBinding>(val binding: T) : StateViewHolder(binding.root)
 }
diff --git a/app/src/main/java/network/omisego/omgwallet/base/StateViewHolderBinding.kt b/app/src/main/java/network/omisego/omgwallet/base/StateViewHolderBinding.kt
index 53af67a..4531fcd 100644
--- a/app/src/main/java/network/omisego/omgwallet/base/StateViewHolderBinding.kt
+++ b/app/src/main/java/network/omisego/omgwallet/base/StateViewHolderBinding.kt
@@ -7,8 +7,10 @@ package network.omisego.omgwallet.base
  * Copyright © 2017-2018 OmiseGO. All rights reserved.
  */
 
+import android.os.Bundle
 import androidx.databinding.ViewDataBinding
 
 interface StateViewHolderBinding<T, R : ViewDataBinding> {
     fun bind(binding: R, data: T)
+    fun resolvePayloadBundle(bundle: Bundle): T?
 }
diff --git a/app/src/main/java/network/omisego/omgwallet/base/BalanceDiffCallback.kt b/app/src/main/java/network/omisego/omgwallet/custom/BalanceDiffCallback.kt
similarity index 60%
rename from app/src/main/java/network/omisego/omgwallet/base/BalanceDiffCallback.kt
rename to app/src/main/java/network/omisego/omgwallet/custom/BalanceDiffCallback.kt
index c2ab2cb..2e05b51 100644
--- a/app/src/main/java/network/omisego/omgwallet/base/BalanceDiffCallback.kt
+++ b/app/src/main/java/network/omisego/omgwallet/custom/BalanceDiffCallback.kt
@@ -1,4 +1,4 @@
-package network.omisego.omgwallet.base
+package network.omisego.omgwallet.custom
 
 /*
  * OmiseGO
@@ -7,6 +7,7 @@ package network.omisego.omgwallet.base
  * Copyright © 2017-2018 OmiseGO. All rights reserved.
  */
 
+import android.os.Bundle
 import androidx.recyclerview.widget.DiffUtil
 import co.omisego.omisego.model.Balance
 
@@ -23,4 +24,19 @@ class BalanceDiffCallback(
     override fun areContentsTheSame(oldPos: Int, newPos: Int): Boolean {
         return oldItems[oldPos].amount == newItems[newPos].amount
     }
+
+    override fun getChangePayload(oldItemPosition: Int, newItemPosition: Int): Any? {
+        val newItem = newItems[newItemPosition]
+        val oldItem = oldItems[oldItemPosition]
+
+        val diff = Bundle()
+        if (oldItem.amount != newItem.amount) {
+            diff.putParcelable("balance", newItem)
+        }
+        return if (diff.size() == 0) {
+            null
+        } else {
+            diff
+        }
+    }
 }
diff --git a/app/src/main/java/network/omisego/omgwallet/custom/BalanceItemAnimator.kt b/app/src/main/java/network/omisego/omgwallet/custom/BalanceItemAnimator.kt
new file mode 100644
index 0000000..81123d1
--- /dev/null
+++ b/app/src/main/java/network/omisego/omgwallet/custom/BalanceItemAnimator.kt
@@ -0,0 +1,139 @@
+package network.omisego.omgwallet.custom
+
+/*
+ * OmiseGO
+ *
+ * Created by Phuchit Sirimongkolsathien on 19/10/2018 AD.
+ * Copyright © 2017-2018 OmiseGO. All rights reserved.
+ */
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.AnimatorSet
+import android.animation.ObjectAnimator
+import android.view.View
+import android.view.animation.AccelerateInterpolator
+import android.view.animation.DecelerateInterpolator
+import android.widget.TextView
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.RecyclerView
+import network.omisego.omgwallet.R
+
+class BalanceItemAnimator : DefaultItemAnimator() {
+    // stateless interpolators re-used for every change animation
+    private val accelerateInterpolator = AccelerateInterpolator()
+    private val decelerateInterpolator = DecelerateInterpolator()
+
+    // Maps to hold running animators. These are used when running a new change
+    // animation on an item that is already being animated. mRunningAnimators is
+    // used to cancel the previous animation. mAnimatorMap is used to construct
+    // the new change animation based on where the previous one was at when it
+    // was interrupted.
+    private val animatorMap: MutableMap<RecyclerView.ViewHolder, AnimatorInfo> = mutableMapOf()
+
+    // This allows our custom change animation on the contents of the holder instead
+    // of the default behavior of replacing the viewHolder entirely
+    override fun canReuseUpdatedViewHolder(viewHolder: RecyclerView.ViewHolder) = true
+
+    override fun obtainHolderInfo(): ItemHolderInfo = BalanceInfo()
+
+    private fun getItemHolderInfo(viewHolder: RecyclerView.ViewHolder, balanceInfo: BalanceInfo): BalanceInfo {
+        val tvAmount = viewHolder.itemView.findViewById<TextView>(R.id.tvAmount)
+        return balanceInfo.copy(text = tvAmount.text.toString())
+    }
+
+    override fun recordPreLayoutInformation(state: RecyclerView.State, viewHolder: RecyclerView.ViewHolder, changeFlags: Int, payloads: MutableList<Any>): ItemHolderInfo {
+        val oldBalanceInfo = super.recordPreLayoutInformation(state, viewHolder, changeFlags, payloads) as BalanceInfo
+        return getItemHolderInfo(viewHolder, oldBalanceInfo)
+    }
+
+    override fun recordPostLayoutInformation(state: RecyclerView.State, viewHolder: RecyclerView.ViewHolder): ItemHolderInfo {
+        val newBalanceInfo = super.recordPostLayoutInformation(state, viewHolder) as BalanceInfo
+        return getItemHolderInfo(viewHolder, newBalanceInfo)
+    }
+
+    override fun animateChange(oldHolder: RecyclerView.ViewHolder, newHolder: RecyclerView.ViewHolder, preInfo: ItemHolderInfo, postInfo: ItemHolderInfo): Boolean {
+        if (oldHolder != newHolder) {
+            // use default behavior if not re-using view holders
+            return super.animateChange(oldHolder, newHolder, preInfo, postInfo)
+        }
+
+        val tvAmount = newHolder.itemView.findViewById<TextView>(R.id.tvAmount)
+
+        val oldInfo = (preInfo as BalanceInfo)
+        val newInfo = (postInfo as BalanceInfo)
+        val oldText = oldInfo.text
+        val newText = newInfo.text
+
+        val runningInfo = animatorMap[newHolder]
+
+        runningInfo?.changeSet?.cancel()
+
+        val startPosition = 50f
+
+        val animMoveIn = ObjectAnimator.ofFloat(tvAmount, View.TRANSLATION_Y, startPosition, 0f)
+        val animMoveOut = ObjectAnimator.ofFloat(tvAmount, View.TRANSLATION_Y, 0f, -startPosition)
+        val animFadeIn = ObjectAnimator.ofFloat(tvAmount, View.ALPHA, 0f, 1f)
+        val animFadeOut = ObjectAnimator.ofFloat(tvAmount, View.ALPHA, 1f, 0f)
+
+        animMoveIn.interpolator = decelerateInterpolator
+        animMoveOut.interpolator = accelerateInterpolator
+        animFadeIn.interpolator = decelerateInterpolator
+        animFadeOut.interpolator = accelerateInterpolator
+
+        animMoveOut.removeAllUpdateListeners()
+        animMoveOut.addUpdateListener {
+            if (it.animatedFraction == 1.0f) {
+                tvAmount.text = newText
+            } else if (it.animatedFraction == 0.0f) {
+                tvAmount.text = oldText
+            }
+        }
+
+        val moveSet = AnimatorSet().apply { playSequentially(animMoveOut, animMoveIn) }
+        val fadeSet = AnimatorSet().apply { playSequentially(animFadeOut, animFadeIn) }
+        val changeSet = AnimatorSet().apply { playTogether(fadeSet, moveSet) }
+
+        changeSet.addListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator?) {
+                dispatchAnimationFinished(newHolder)
+                animatorMap.remove(newHolder)
+            }
+        })
+        changeSet.start()
+        tvAmount.invalidate()
+
+        // Store info about this animation to be re-used if a succeeding change event
+        animatorMap[newHolder] = AnimatorInfo(changeSet, animFadeIn, animFadeOut, animMoveIn, animMoveOut)
+        return true
+    }
+
+    override fun endAnimation(item: RecyclerView.ViewHolder) {
+        super.endAnimation(item)
+        animatorMap.filter { it.key == item }.forEach { it.value.changeSet.cancel() }
+    }
+
+    override fun isRunning(): Boolean {
+        return super.isRunning() || !animatorMap.isEmpty()
+    }
+
+    override fun endAnimations() {
+        super.endAnimations()
+        animatorMap.forEach { it.value.changeSet.cancel() }
+    }
+
+    /**
+     * Holds child animator objects for any change animation. Used when a new change
+     * animation interrupts one already in progress; the new one is constructed to start
+     * from where the previous one was at when the interruption occurred.
+     */
+    private data class AnimatorInfo(
+        var changeSet: AnimatorSet,
+        var animFadeIn: ObjectAnimator,
+        var animFadeOut: ObjectAnimator,
+        var animMoveIn: ObjectAnimator,
+        var animMoveOut: ObjectAnimator
+    )
+
+    private data class BalanceInfo(val text: String = "") : ItemHolderInfo()
+}
\ No newline at end of file
diff --git a/app/src/main/java/network/omisego/omgwallet/base/LoadingDiffCallback.kt b/app/src/main/java/network/omisego/omgwallet/custom/LoadingDiffCallback.kt
similarity index 94%
rename from app/src/main/java/network/omisego/omgwallet/base/LoadingDiffCallback.kt
rename to app/src/main/java/network/omisego/omgwallet/custom/LoadingDiffCallback.kt
index b426eee..146d4a1 100644
--- a/app/src/main/java/network/omisego/omgwallet/base/LoadingDiffCallback.kt
+++ b/app/src/main/java/network/omisego/omgwallet/custom/LoadingDiffCallback.kt
@@ -1,4 +1,4 @@
-package network.omisego.omgwallet.base
+package network.omisego.omgwallet.custom
 
 import androidx.recyclerview.widget.DiffUtil
 
diff --git a/app/src/main/java/network/omisego/omgwallet/custom/MoveUpBehavior.kt b/app/src/main/java/network/omisego/omgwallet/custom/MoveUpBehavior.kt
new file mode 100644
index 0000000..bb183e8
--- /dev/null
+++ b/app/src/main/java/network/omisego/omgwallet/custom/MoveUpBehavior.kt
@@ -0,0 +1,29 @@
+package network.omisego.omgwallet.custom
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.google.android.material.snackbar.Snackbar
+
+/*
+ * OmiseGO
+ *
+ * Created by Phuchit Sirimongkolsathien on 18/10/2018 AD.
+ * Copyright © 2017-2018 OmiseGO. All rights reserved.
+ */
+
+class MoveUpBehavior : CoordinatorLayout.Behavior<View> {
+
+    constructor() : super()
+    constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet)
+
+    override fun layoutDependsOn(parent: CoordinatorLayout, child: View, dependency: View): Boolean {
+        return dependency is Snackbar.SnackbarLayout
+    }
+
+    override fun onDependentViewChanged(parent: CoordinatorLayout, child: View, dependency: View): Boolean {
+//        child.translationY = Math.min(0f, dependency.translationY - dependency.height)
+        return true
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/network/omisego/omgwallet/data/LocalRepository.kt b/app/src/main/java/network/omisego/omgwallet/data/LocalRepository.kt
index baf2d75..cb598f7 100644
--- a/app/src/main/java/network/omisego/omgwallet/data/LocalRepository.kt
+++ b/app/src/main/java/network/omisego/omgwallet/data/LocalRepository.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.MutableLiveData
 import co.omisego.omisego.model.Token
 import co.omisego.omisego.model.User
 import co.omisego.omisego.model.WalletList
+import co.omisego.omisego.model.transaction.request.TransactionRequestType
 import network.omisego.omgwallet.data.contract.BalanceDataRepository
 import network.omisego.omgwallet.livedata.Event
 import network.omisego.omgwallet.model.APIResult
@@ -18,12 +19,16 @@ import network.omisego.omgwallet.storage.Storage
  */
 
 class LocalRepository : BalanceDataRepository {
-    override fun loadWallet(liveAPIResult: MutableLiveData<Event<APIResult>>, networkOnly: Boolean) {
-        liveAPIResult.value = Event(APIResult.Success(Storage.loadWallets()))
+    override fun loadWallet(liveAPIResult: MutableLiveData<Event<APIResult>>) {
+        liveAPIResult.value = Event(APIResult.Success(loadWallet()))
     }
 
     fun clearSession() = Storage.clearSession()
 
+    fun clearOldAccountCache(email: String) = Storage.clearOldAccountCache(email)
+
+    fun hasFormattedId() = Storage.hasFormattedId()
+
     fun deleteFingerprintCredential() {
         Storage.deleteFingerprintCredential()
     }
@@ -40,6 +45,12 @@ class LocalRepository : BalanceDataRepository {
 
     fun loadFingerprintCredential() = Storage.loadFingerprintCredential()
 
+    fun loadTransactionRequestFormattedId() = Storage.loadFormattedId()
+
+    fun loadUser() = Storage.loadUser()
+
+    fun saveTransactionRequestFormattedId(formattedIds: Map<TransactionRequestType, String>) = Storage.saveFormattedId(formattedIds)
+
     fun saveUser(user: User) = Storage.saveUser(user)
 
     fun saveCredential(credential: Credential) = Storage.saveCredential(credential)
diff --git a/app/src/main/java/network/omisego/omgwallet/data/RemoteRepository.kt b/app/src/main/java/network/omisego/omgwallet/data/RemoteRepository.kt
index 6fa8baa..878f927 100644
--- a/app/src/main/java/network/omisego/omgwallet/data/RemoteRepository.kt
+++ b/app/src/main/java/network/omisego/omgwallet/data/RemoteRepository.kt
@@ -2,15 +2,27 @@ package network.omisego.omgwallet.data
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import co.omisego.omisego.model.APIError
+import co.omisego.omisego.model.OMGResponse
 import co.omisego.omisego.model.params.LoginParams
 import co.omisego.omisego.model.params.SignUpParams
+import co.omisego.omisego.model.transaction.consumption.TransactionConsumption
+import co.omisego.omisego.model.transaction.consumption.TransactionConsumptionActionParams
 import co.omisego.omisego.model.transaction.list.TransactionListParams
+import co.omisego.omisego.model.transaction.request.TransactionRequest
+import co.omisego.omisego.model.transaction.request.TransactionRequestCreateParams
+import co.omisego.omisego.operation.startListeningEvents
+import co.omisego.omisego.websocket.event.TransactionConsumptionFinalizedEvent
+import co.omisego.omisego.websocket.event.TransactionConsumptionRequestEvent
+import co.omisego.omisego.websocket.listener.SocketCustomEventListener
 import network.omisego.omgwallet.data.contract.BalanceDataRepository
 import network.omisego.omgwallet.extension.subscribe
 import network.omisego.omgwallet.extension.subscribeSingleEvent
 import network.omisego.omgwallet.livedata.Event
 import network.omisego.omgwallet.model.APIResult
 import network.omisego.omgwallet.network.ClientProvider
+import network.omisego.omgwallet.storage.Storage
+import retrofit2.Response
 
 /*
  * OmiseGO
@@ -20,7 +32,11 @@ import network.omisego.omgwallet.network.ClientProvider
  */
 
 class RemoteRepository : BalanceDataRepository {
-    override fun loadWallet(liveAPIResult: MutableLiveData<Event<APIResult>>, networkOnly: Boolean) {
+    fun createTransactionRequest(params: TransactionRequestCreateParams): Response<OMGResponse<TransactionRequest>> {
+        return ClientProvider.client.createTransactionRequest(params).execute()
+    }
+
+    override fun loadWallet(liveAPIResult: MutableLiveData<Event<APIResult>>) {
         ClientProvider.client.getWallets().subscribeSingleEvent(liveAPIResult)
     }
 
@@ -35,4 +51,54 @@ class RemoteRepository : BalanceDataRepository {
     fun getTransactions(params: TransactionListParams, liveAPIResult: MutableLiveData<APIResult>) {
         ClientProvider.client.getTransactions(params).subscribe(liveAPIResult)
     }
+
+    fun approveTransaction(id: String, liveAPIResult: MutableLiveData<Event<APIResult>>) {
+        ClientProvider.client
+            .approveTransactionConsumption(TransactionConsumptionActionParams(id))
+            .subscribeSingleEvent(liveAPIResult)
+    }
+
+    fun rejectTransaction(id: String, liveAPIResult: MutableLiveData<Event<APIResult>>) {
+        ClientProvider.client
+            .rejectTransactionConsumption(TransactionConsumptionActionParams(id))
+            .subscribeSingleEvent(liveAPIResult)
+    }
+
+    fun listenUserSocketEvent(
+        liveConsumptionRequestEvent: MutableLiveData<TransactionConsumption>,
+        liveConsumptionRequestFailEvent: MutableLiveData<APIError>,
+        liveConsumptionFinalizedEvent: MutableLiveData<TransactionConsumption>,
+        liveConsumptionFinalizedFailEvent: MutableLiveData<APIError>
+    ) {
+        /* Listen for request event */
+        val user = Storage.loadUser()
+        user?.startListeningEvents(
+            ClientProvider.socketClient,
+            listener = SocketCustomEventListener.forEvent<TransactionConsumptionRequestEvent> {
+                /* TODO: Handle incoming transaction consumption request event here*/
+                // Show confirmation fragment here
+                val txConsumption = it.socketReceive
+                if (txConsumption.error == null) {
+                    liveConsumptionRequestEvent.value = txConsumption.data
+                } else {
+                    liveConsumptionRequestFailEvent.value = txConsumption.error
+                }
+            })
+        user?.startListeningEvents(
+            ClientProvider.socketClient,
+            listener = SocketCustomEventListener.forEvent<TransactionConsumptionFinalizedEvent> {
+                /* TODO: Handle transaction consumption finalized event here */
+                val txConsumption = it.socketReceive
+                if (txConsumption.error == null) {
+                    liveConsumptionFinalizedEvent.value = txConsumption.data
+                } else {
+                    liveConsumptionFinalizedFailEvent.value = txConsumption.error
+                }
+            })
+    }
+
+    fun stopListeningToUserSocketEvent() {
+        val user = Storage.loadUser()
+        user?.stopListening(ClientProvider.socketClient)
+    }
 }
diff --git a/app/src/main/java/network/omisego/omgwallet/data/contract/BalanceDataRepository.kt b/app/src/main/java/network/omisego/omgwallet/data/contract/BalanceDataRepository.kt
index af3f4d6..31e6bc7 100644
--- a/app/src/main/java/network/omisego/omgwallet/data/contract/BalanceDataRepository.kt
+++ b/app/src/main/java/network/omisego/omgwallet/data/contract/BalanceDataRepository.kt
@@ -12,5 +12,5 @@ import network.omisego.omgwallet.livedata.Event
 import network.omisego.omgwallet.model.APIResult
 
 interface BalanceDataRepository {
-    fun loadWallet(liveAPIResult: MutableLiveData<Event<APIResult>>, networkOnly: Boolean = false)
+    fun loadWallet(liveAPIResult: MutableLiveData<Event<APIResult>>)
 }
diff --git a/app/src/main/java/network/omisego/omgwallet/extension/ContextExt.kt b/app/src/main/java/network/omisego/omgwallet/extension/ContextExt.kt
index 05deb30..1f80213 100644
--- a/app/src/main/java/network/omisego/omgwallet/extension/ContextExt.kt
+++ b/app/src/main/java/network/omisego/omgwallet/extension/ContextExt.kt
@@ -9,10 +9,12 @@ package network.omisego.omgwallet.extension
 
 import android.content.Context
 import android.util.TypedValue
+import android.view.View
 import android.widget.Toast
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
+import com.google.android.material.snackbar.Snackbar
 
 fun Context.dpToPx(dp: Float): Int {
     return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, resources.displayMetrics).toInt()
diff --git a/app/src/main/java/network/omisego/omgwallet/extension/AndroidVersionExt.kt b/app/src/main/java/network/omisego/omgwallet/extension/GlobalExt.kt
similarity index 100%
rename from app/src/main/java/network/omisego/omgwallet/extension/AndroidVersionExt.kt
rename to app/src/main/java/network/omisego/omgwallet/extension/GlobalExt.kt
diff --git a/app/src/main/java/network/omisego/omgwallet/extension/LiveDataExt.kt b/app/src/main/java/network/omisego/omgwallet/extension/LiveDataExt.kt
index 91609d3..b0daf4f 100644
--- a/app/src/main/java/network/omisego/omgwallet/extension/LiveDataExt.kt
+++ b/app/src/main/java/network/omisego/omgwallet/extension/LiveDataExt.kt
@@ -10,21 +10,11 @@ package network.omisego.omgwallet.extension
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Transformations
 
 fun <T> mutableLiveDataOf(initial: T? = null): MutableLiveData<T> {
     return MutableLiveData<T>().apply { this.value = initial }
 }
 
-fun <T> MutableLiveData<T>.fetchedThenCache(fetch: (MutableLiveData<T>) -> LiveData<T>): LiveData<T> =
-    if (value != null) {
-        this
-    } else {
-        fetch(this)
-    }
-
-fun <T, R> LiveData<T>.map(transform: (T) -> R) = Transformations.map(this, transform)
-
 /**
  * Don't dispatch if the transformed data is not changed.
  */
@@ -39,5 +29,3 @@ fun <T, R> LiveData<T>.mapPropChanged(transform: (T) -> R): LiveData<R> {
         }
     }
 }
-
-fun <T, R> LiveData<T>.switchMap(transform: (T) -> LiveData<R>) = Transformations.switchMap(this, transform)
diff --git a/app/src/main/java/network/omisego/omgwallet/extension/ResponseExt.kt b/app/src/main/java/network/omisego/omgwallet/extension/ResponseExt.kt
new file mode 100644
index 0000000..3d603e6
--- /dev/null
+++ b/app/src/main/java/network/omisego/omgwallet/extension/ResponseExt.kt
@@ -0,0 +1,25 @@
+package network.omisego.omgwallet.extension
+
+import co.omisego.omisego.model.APIError
+import co.omisego.omisego.utils.Either
+import co.omisego.omisego.utils.GsonProvider
+import retrofit2.Response
+
+/*
+ * OmiseGO
+ *
+ * Created by Phuchit Sirimongkolsathien on 17/10/2018 AD.
+ * Copyright © 2017-2018 OmiseGO. All rights reserved.
+ */
+
+/*  Either<T,APIError> */
+
+fun <T> Response<T>.either(doOnSuccess: (T) -> Unit, doOnError: (APIError) -> Unit) {
+    val successOrError = if (this.isSuccessful) {
+        Either.Left(this.body()!!)
+    } else {
+        Either.Right(GsonProvider.create().fromJson(this.errorBody()?.string(), APIError::class.java))
+    }
+
+    successOrError.either(doOnSuccess, doOnError)
+}
diff --git a/app/src/main/java/network/omisego/omgwallet/extension/ViewExt.kt b/app/src/main/java/network/omisego/omgwallet/extension/ViewExt.kt
new file mode 100644
index 0000000..bb7c3dd
--- /dev/null
+++ b/app/src/main/java/network/omisego/omgwallet/extension/ViewExt.kt
@@ -0,0 +1,19 @@
+package network.omisego.omgwallet.extension
+
+/*
+ * OmiseGO
+ *
+ * Created by Phuchit Sirimongkolsathien on 19/10/2018 AD.
+ * Copyright © 2017-2018 OmiseGO. All rights reserved.
+ */
+
+import android.view.View
+import android.widget.TextView
+import com.google.android.material.snackbar.Snackbar
+
+fun View.snackbar(msg: String, duration: Int = Snackbar.LENGTH_LONG): Snackbar {
+    val snackbar = Snackbar.make(this, msg, duration)
+    val textView = snackbar.view.findViewById<TextView>(com.google.android.material.R.id.snackbar_text)
+    textView.maxLines = 5
+    return snackbar
+}
diff --git a/app/src/main/java/network/omisego/omgwallet/network/ClientProvider.kt b/app/src/main/java/network/omisego/omgwallet/network/ClientProvider.kt
index d0dcbc3..aeaef42 100644
--- a/app/src/main/java/network/omisego/omgwallet/network/ClientProvider.kt
+++ b/app/src/main/java/network/omisego/omgwallet/network/ClientProvider.kt
@@ -3,6 +3,8 @@ package network.omisego.omgwallet.network
 import co.omisego.omisego.OMGAPIClient
 import co.omisego.omisego.model.ClientConfiguration
 import co.omisego.omisego.network.ewallet.EWalletClient
+import co.omisego.omisego.websocket.OMGSocketClient
+import co.omisego.omisego.websocket.SocketClientContract
 import com.facebook.stetho.okhttp3.StethoInterceptor
 import network.omisego.omgwallet.model.Credential
 import network.omisego.omgwallet.storage.Storage
@@ -20,7 +22,9 @@ object ClientProvider {
         get() = Storage.loadCredential()
 
     private lateinit var clientConfiguration: ClientConfiguration
+    private lateinit var socketClientConfiguration: ClientConfiguration
     lateinit var client: OMGAPIClient
+    lateinit var socketClient: SocketClientContract.Client
     lateinit var eWalletClient: EWalletClient
     lateinit var clientSetup: ClientSetup
 
@@ -31,8 +35,9 @@ object ClientProvider {
             clientSetup.apiKey,
             credential.authenticationToken
         )
-
+        socketClientConfiguration = clientConfiguration.copy(baseURL = clientSetup.socketBaseURL)
         client = create()
+        socketClient = createSocketClient()
     }
 
     private fun create(): OMGAPIClient {
@@ -42,7 +47,7 @@ object ClientProvider {
             debugOkHttpInterceptors = mutableListOf(
                 StethoInterceptor(),
                 HttpLoggingInterceptor().apply {
-                    level = HttpLoggingInterceptor.Level.BODY
+                    level = HttpLoggingInterceptor.Level.BASIC
                 }
             )
         }.build()
@@ -50,4 +55,11 @@ object ClientProvider {
             eWalletClient
         )
     }
+
+    private fun createSocketClient(): SocketClientContract.Client {
+        return OMGSocketClient.Builder {
+            clientConfiguration = this@ClientProvider.socketClientConfiguration
+            debug = true
+        }.build()
+    }
 }
diff --git a/app/src/main/java/network/omisego/omgwallet/network/ClientSetup.kt b/app/src/main/java/network/omisego/omgwallet/network/ClientSetup.kt
index 43aba18..b63402d 100644
--- a/app/src/main/java/network/omisego/omgwallet/network/ClientSetup.kt
+++ b/app/src/main/java/network/omisego/omgwallet/network/ClientSetup.kt
@@ -8,5 +8,6 @@ package network.omisego.omgwallet.network
  */
 interface ClientSetup {
     val baseURL: String
+    val socketBaseURL: String
     val apiKey: String
 }
\ No newline at end of file
diff --git a/app/src/main/java/network/omisego/omgwallet/network/ProductionClientSetup.kt b/app/src/main/java/network/omisego/omgwallet/network/ProductionClientSetup.kt
index 4b5deb2..d614bd9 100644
--- a/app/src/main/java/network/omisego/omgwallet/network/ProductionClientSetup.kt
+++ b/app/src/main/java/network/omisego/omgwallet/network/ProductionClientSetup.kt
@@ -11,6 +11,8 @@ import network.omisego.omgwallet.BuildConfig
 class ProductionClientSetup : ClientSetup {
     override val baseURL: String
         get() = BuildConfig.CLIENT_API_BASE_URL
+    override val socketBaseURL: String
+        get() = BuildConfig.CLIENT_API_SOCKET_BASE_URL
     override val apiKey: String
         get() = BuildConfig.CLIENT_API_KEY
 }
\ No newline at end of file
diff --git a/app/src/main/java/network/omisego/omgwallet/screen/auth/AuthFragment.kt b/app/src/main/java/network/omisego/omgwallet/screen/auth/AuthFragment.kt
deleted file mode 100644
index a2bdd58..0000000
--- a/app/src/main/java/network/omisego/omgwallet/screen/auth/AuthFragment.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package network.omisego.omgwallet.screen.auth
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.Window
-import android.view.WindowManager
-import androidx.fragment.app.Fragment
-import androidx.navigation.NavController
-import androidx.navigation.NavDestination
-import androidx.navigation.findNavController
-import androidx.navigation.ui.setupWithNavController
-import kotlinx.android.synthetic.main.fragment_authenticated.*
-import network.omisego.omgwallet.MainActivity
-import network.omisego.omgwallet.R
-import network.omisego.omgwallet.extension.getColor
-
-class AuthFragment : Fragment() {
-
-    private lateinit var navigateListener: (NavController, NavDestination) -> Unit
-    private lateinit var navController: NavController
-    private val window: Window by lazy {
-        activity?.window!!.apply {
-            addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
-        }
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        setupNavController()
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_authenticated, container, false)
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        navController.removeOnNavigatedListener(navigateListener)
-    }
-
-    private fun setupNavController() {
-        navController = (activity as MainActivity).findNavController(R.id.content)
-        toolbar.setupWithNavController(navController)
-        bottomNavigation.setupWithNavController(navController)
-        fabQR.setOnClickListener { navController.navigate(R.id.action_global_showQR) }
-        navigateListener = { _, destination ->
-            setBottomNavigationVisibility(destination.id != R.id.showQR)
-        }
-        navController.addOnNavigatedListener(navigateListener)
-    }
-
-    private fun setBottomNavigationVisibility(visible: Boolean) {
-        if (visible) {
-            (fabQR as View).visibility = View.VISIBLE
-            bottomNavigation.visibility = View.VISIBLE
-            toolbar.setBackgroundColor(context getColor R.color.colorGray)
-            window.statusBarColor = context getColor R.color.colorGray
-        } else {
-            (fabQR as View).visibility = View.GONE
-            bottomNavigation.visibility = View.INVISIBLE
-            toolbar.setBackgroundColor(context getColor R.color.colorBlue)
-            window.statusBarColor = context getColor R.color.colorBlue
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/network/omisego/omgwallet/screen/auth/MainFragment.kt b/app/src/main/java/network/omisego/omgwallet/screen/auth/MainFragment.kt
new file mode 100644
index 0000000..b1d35ae
--- /dev/null
+++ b/app/src/main/java/network/omisego/omgwallet/screen/auth/MainFragment.kt
@@ -0,0 +1,175 @@
+package network.omisego.omgwallet.screen.auth
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.Window
+import android.view.WindowManager
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.navigation.NavController
+import androidx.navigation.NavDestination
+import androidx.navigation.findNavController
+import androidx.navigation.ui.setupWithNavController
+import co.omisego.omisego.model.APIError
+import co.omisego.omisego.model.transaction.consumption.TransactionConsumption
+import co.omisego.omisego.model.transaction.consumption.TransactionConsumptionStatus.APPROVED
+import co.omisego.omisego.model.transaction.consumption.TransactionConsumptionStatus.CONFIRMED
+import co.omisego.omisego.model.transaction.consumption.TransactionConsumptionStatus.REJECTED
+import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.fragment_main.*
+import network.omisego.omgwallet.GraphMainDirections
+import network.omisego.omgwallet.MainActivity
+import network.omisego.omgwallet.R
+import network.omisego.omgwallet.extension.getColor
+import network.omisego.omgwallet.extension.logi
+import network.omisego.omgwallet.extension.provideActivityViewModel
+import network.omisego.omgwallet.extension.snackbar
+import network.omisego.omgwallet.screen.auth.balance.BalanceViewModel
+
+class MainFragment : Fragment() {
+
+    private lateinit var navigateListener: (NavController, NavDestination) -> Unit
+    private lateinit var navController: NavController
+    private lateinit var viewModel: MainViewModel
+    private lateinit var balanceViewModel: BalanceViewModel
+    private lateinit var snackbar: Snackbar
+    private val hostActivity: MainActivity
+        get() = (activity as MainActivity)
+    private val window: Window by lazy {
+        activity?.window!!.apply {
+            addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        viewModel = provideActivityViewModel()
+        balanceViewModel = provideActivityViewModel()
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        setupNavController()
+        listenForSocketEvent()
+    }
+
+    override fun onStart() {
+        super.onStart()
+        showSplashIfNeeded()
+        viewModel.startListenForUserEvent()
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_main, container, false)
+    }
+
+    override fun onStop() {
+        super.onStop()
+        viewModel.stopListenForUserEvent()
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        navController.removeOnNavigatedListener(navigateListener)
+    }
+
+    private fun listenForSocketEvent() {
+        viewModel.liveConsumptionRequestEvent.observe(this, ConsumptionRequestObserver())
+        viewModel.liveConsumptionRequestFailEvent.observe(this, ConsumptionRequestFailObserver())
+        viewModel.liveConsumptionFinalizedEvent.observe(this, ConsumptionFinalizedObserver())
+        viewModel.liveConsumptionFinalizedFailEvent.observe(this, ConsumptionFinalizedFailObserver())
+    }
+
+    private fun showSplashIfNeeded() {
+        if (!viewModel.hasTransactionRequestFormattedId()) {
+            navController.navigate(viewModel.provideSplashDirection())
+        }
+    }
+
+    private fun setupNavController() {
+        navController = hostActivity.findNavController(R.id.content)
+        toolbar.setupWithNavController(navController)
+        bottomNavigation.setupWithNavController(navController)
+        fabQR.setOnClickListener { navController.navigate(R.id.action_global_showQR) }
+        navigateListener = { _, destination ->
+            setBottomNavigationVisibility(destination.id !in arrayOf(R.id.showQR, R.id.splash))
+            toolbar.visibility = if (destination.id == R.id.splash) {
+                View.GONE
+            } else {
+                View.VISIBLE
+            }
+        }
+        navController.addOnNavigatedListener(navigateListener)
+    }
+
+    private fun setBottomNavigationVisibility(visible: Boolean) {
+        if (visible) {
+            (fabQR as View).visibility = View.VISIBLE
+            bottomNavigation.visibility = View.VISIBLE
+            toolbar.setBackgroundColor(context getColor R.color.colorGray)
+            window.statusBarColor = context getColor R.color.colorGray
+        } else {
+            (fabQR as View).visibility = View.GONE
+            bottomNavigation.visibility = View.INVISIBLE
+            toolbar.setBackgroundColor(context getColor R.color.colorBlue)
+            window.statusBarColor = context getColor R.color.colorBlue
+        }
+    }
+
+    inner class ConsumptionRequestObserver : Observer<TransactionConsumption> {
+        override fun onChanged(txConsumption: TransactionConsumption) {
+            navController.navigate(GraphMainDirections.actionGlobalConfirmTransactionRequest(txConsumption))
+            val message = "${txConsumption.transaction?.to?.account?.name} will be taken your token ${txConsumption.token.symbol} for amount ${txConsumption.estimatedRequestAmount.div(txConsumption.transactionRequest.token.subunitToUnit)}"
+            logi(message)
+        }
+    }
+
+    inner class ConsumptionRequestFailObserver : Observer<APIError> {
+        override fun onChanged(error: APIError) {
+            logi("Consumption error: ${error.description}")
+        }
+    }
+
+    inner class ConsumptionFinalizedObserver : Observer<TransactionConsumption> {
+        override fun onChanged(txConsumption: TransactionConsumption) {
+            /* Show notification */
+            val message: String
+            when (txConsumption.status) {
+                CONFIRMED,
+                APPROVED -> {
+                    val amount = txConsumption.estimatedRequestAmount.divide(txConsumption.transactionRequest.token.subunitToUnit)
+                    message = getString(
+                        R.string.notification_transaction_received,
+                        amount,
+                        txConsumption.transactionRequest.token.symbol,
+                        txConsumption.account?.name
+                    )
+                    snackbar = bottomNavigation.snackbar(message)
+                    snackbar.show()
+                }
+                REJECTED -> {
+                    message = getString(
+                        R.string.notification_transaction_rejected,
+                        txConsumption.account?.name
+                    )
+                    snackbar = bottomNavigation.snackbar(message)
+                    snackbar.show()
+                }
+            }
+            if (txConsumption.transactionRequest.requireConfirmation) {
+                navController.popBackStack(R.id.balance, true)
+                navController.navigate(R.id.action_global_balance)
+            } else {
+                balanceViewModel.loadWallet()
+            }
+        }
+    }
+
+    inner class ConsumptionFinalizedFailObserver : Observer<APIError> {
+        override fun onChanged(error: APIError) {
+            logi("ConsumptionFinalized error: ${error.description}")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/network/omisego/omgwallet/screen/auth/MainViewModel.kt b/app/src/main/java/network/omisego/omgwallet/screen/auth/MainViewModel.kt
new file mode 100644
index 0000000..2d88072
--- /dev/null
+++ b/app/src/main/java/network/omisego/omgwallet/screen/auth/MainViewModel.kt
@@ -0,0 +1,51 @@
+package network.omisego.omgwallet.screen.auth
+
+/*
+ * OmiseGO
+ *
+ * Created by Phuchit Sirimongkolsathien on 17/10/2018 AD.
+ * Copyright © 2017-2018 OmiseGO. All rights reserved.
+ */
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import co.omisego.omisego.model.APIError
+import co.omisego.omisego.model.transaction.consumption.TransactionConsumption
+import network.omisego.omgwallet.GraphMainDirections
+import network.omisego.omgwallet.data.LocalRepository
+import network.omisego.omgwallet.data.RemoteRepository
+
+class MainViewModel(
+    private val localRepository: LocalRepository,
+    private val remoteRepository: RemoteRepository
+) : ViewModel() {
+    val liveConsumptionRequestEvent: MutableLiveData<TransactionConsumption> by lazy { MutableLiveData<TransactionConsumption>() }
+    val liveConsumptionRequestFailEvent: MutableLiveData<APIError> by lazy { MutableLiveData<APIError>() }
+    val liveConsumptionFinalizedEvent: MutableLiveData<TransactionConsumption> by lazy { MutableLiveData<TransactionConsumption>() }
+    val liveConsumptionFinalizedFailEvent: MutableLiveData<APIError> by lazy { MutableLiveData<APIError>() }
+
+    fun hasTransactionRequestFormattedId(): Boolean {
+        return localRepository.hasFormattedId()
+    }
+
+    fun loadPrimaryTokenId(): String? {
+        return localRepository.loadTokenPrimary()
+    }
+
+    fun provideSplashDirection() = GraphMainDirections
+        .actionGlobalSplash()
+        .setPrimaryTokenId(loadPrimaryTokenId())
+
+    fun startListenForUserEvent() {
+        remoteRepository.listenUserSocketEvent(
+            liveConsumptionRequestEvent,
+            liveConsumptionRequestFailEvent,
+            liveConsumptionFinalizedEvent,
+            liveConsumptionFinalizedFailEvent
+        )
+    }
+
+    fun stopListenForUserEvent() {
+        remoteRepository.stopListeningToUserSocketEvent()
+    }
+}
diff --git a/app/src/main/java/network/omisego/omgwallet/screen/auth/balance/BalanceFragment.kt b/app/src/main/java/network/omisego/omgwallet/screen/auth/balance/BalanceFragment.kt
index 41d4654..8a05317 100644
--- a/app/src/main/java/network/omisego/omgwallet/screen/auth/balance/BalanceFragment.kt
+++ b/app/src/main/java/network/omisego/omgwallet/screen/auth/balance/BalanceFragment.kt
@@ -18,14 +18,15 @@ import co.omisego.omisego.model.WalletList
 import kotlinx.android.synthetic.main.fragment_balance.*
 import network.omisego.omgwallet.MainActivity
 import network.omisego.omgwallet.R
-import network.omisego.omgwallet.base.BalanceDiffCallback
 import network.omisego.omgwallet.base.LoadingRecyclerAdapter
 import network.omisego.omgwallet.base.StateViewHolder
 import network.omisego.omgwallet.base.UpdateAdapterDispatcher
+import network.omisego.omgwallet.custom.BalanceDiffCallback
+import network.omisego.omgwallet.custom.BalanceItemAnimator
 import network.omisego.omgwallet.databinding.FragmentBalanceBinding
 import network.omisego.omgwallet.databinding.ViewholderBalanceBinding
 import network.omisego.omgwallet.extension.bindingInflate
-import network.omisego.omgwallet.extension.provideViewModel
+import network.omisego.omgwallet.extension.provideActivityViewModel
 import network.omisego.omgwallet.extension.toast
 import network.omisego.omgwallet.livedata.EventObserver
 import network.omisego.omgwallet.storage.Storage
@@ -45,7 +46,7 @@ class BalanceFragment : Fragment(), UpdateAdapterDispatcher<Balance> {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        viewModel = provideViewModel()
+        viewModel = provideActivityViewModel()
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -98,6 +99,7 @@ class BalanceFragment : Fragment(), UpdateAdapterDispatcher<Balance> {
         adapter = LoadingRecyclerAdapter(R.layout.viewholder_balance_loading, R.layout.viewholder_balance, viewModel, this)
         recyclerView.layoutManager = LinearLayoutManager(context)
         recyclerView.adapter = adapter
+        recyclerView.itemAnimator = BalanceItemAnimator()
 
         swipeRefresh.setOnRefreshListener {
             viewModel.loadWallet()
diff --git a/app/src/main/java/network/omisego/omgwallet/screen/auth/balance/BalanceViewModel.kt b/app/src/main/java/network/omisego/omgwallet/screen/auth/balance/BalanceViewModel.kt
index bdd0a71..5c41168 100644
--- a/app/src/main/java/network/omisego/omgwallet/screen/auth/balance/BalanceViewModel.kt
+++ b/app/src/main/java/network/omisego/omgwallet/screen/auth/balance/BalanceViewModel.kt
@@ -7,6 +7,7 @@ package network.omisego.omgwallet.screen.auth.balance
  * Copyright © 2017-2018 OmiseGO. All rights reserved.
  */
 
+import android.os.Bundle
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import co.omisego.omisego.model.Balance
@@ -26,10 +27,14 @@ class BalanceViewModel(
 
     val liveBalanceClickEvent: MutableLiveData<Event<Balance>> by lazy { MutableLiveData<Event<Balance>>() }
 
+    override fun resolvePayloadBundle(bundle: Bundle): Balance? {
+        return bundle.getParcelable("balance")
+    }
+
     override fun bind(binding: ViewholderBalanceBinding, data: Balance) {
         binding.balance = data
         binding.viewModel = this
-        binding.displayAmount = data.displayAmount(2)
+        binding.tvAmount.text = data.displayAmount(2)
     }
 
     val liveResult: MutableLiveData<Event<APIResult>> by lazy { MutableLiveData<Event<APIResult>>() }
@@ -43,6 +48,7 @@ class BalanceViewModel(
     }
 
     fun loadWallet() {
+        localRepository.loadWallet(liveResult)
         remoteRepository.loadWallet(liveResult)
     }
 
diff --git a/app/src/main/java/network/omisego/omgwallet/screen/auth/balance/detail/BalanceDetailFragment.kt b/app/src/main/java/network/omisego/omgwallet/screen/auth/balance/detail/BalanceDetailFragment.kt
index dd7e32c..bf7cc7e 100644
--- a/app/src/main/java/network/omisego/omgwallet/screen/auth/balance/detail/BalanceDetailFragment.kt
+++ b/app/src/main/java/network/omisego/omgwallet/screen/auth/balance/detail/BalanceDetailFragment.kt
@@ -13,12 +13,12 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.findNavController
 import co.omisego.omisego.model.Balance
 import kotlinx.android.synthetic.main.fragment_balance_detail.*
 import network.omisego.omgwallet.R
 import network.omisego.omgwallet.databinding.FragmentBalanceDetailBinding
 import network.omisego.omgwallet.extension.provideActivityAndroidViewModel
-import network.omisego.omgwallet.extension.toast
 import network.omisego.omgwallet.livedata.EventObserver
 
 class BalanceDetailFragment : Fragment() {
@@ -41,8 +41,8 @@ class BalanceDetailFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         setupViewPager()
         viewModel.liveEventTokenPrimaryId.observe(this, EventObserver { primaryTokenId ->
-            val balance = balances.findLast { it.token.id == primaryTokenId }
-            context?.toast(viewModel.displayTokenPrimaryNotify(balance!!))
+            val dirGlobalSplash = viewModel.provideSplashDirection(primaryTokenId)
+            findNavController().navigate(dirGlobalSplash)
         })
     }
 
diff --git a/app/src/main/java/network/omisego/omgwallet/screen/auth/balance/detail/BalanceDetailViewModel.kt b/app/src/main/java/network/omisego/omgwallet/screen/auth/balance/detail/BalanceDetailViewModel.kt
index f19d146..97253fd 100644
--- a/app/src/main/java/network/omisego/omgwallet/screen/auth/balance/detail/BalanceDetailViewModel.kt
+++ b/app/src/main/java/network/omisego/omgwallet/screen/auth/balance/detail/BalanceDetailViewModel.kt
@@ -3,9 +3,8 @@ package network.omisego.omgwallet.screen.auth.balance.detail
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
-import co.omisego.omisego.model.Balance
 import co.omisego.omisego.model.Token
-import network.omisego.omgwallet.R
+import network.omisego.omgwallet.GraphMainDirections
 import network.omisego.omgwallet.data.LocalRepository
 import network.omisego.omgwallet.livedata.Event
 
@@ -23,16 +22,18 @@ class BalanceDetailViewModel(
     val liveTokenPrimaryId: MutableLiveData<String> by lazy { MutableLiveData<String>() }
     val liveEventTokenPrimaryId: MutableLiveData<Event<String>> by lazy { MutableLiveData<Event<String>>() }
 
-    fun displayTokenPrimaryNotify(balance: Balance) = app.getString(R.string.balance_detail_primary_token_set_notify, balance.token.symbol)
-
     fun loadBalances() = localRepository.loadWallet()?.data?.get(0)?.balances!!
 
     fun saveTokenPrimary(token: Token) {
         liveTokenPrimaryId.value = token.id
         liveEventTokenPrimaryId.value = Event(token.id)
-        localRepository.saveTokenPrimary(token)
     }
 
+    fun provideSplashDirection(primaryTokenId: String) = GraphMainDirections
+        .actionGlobalSplash()
+        .setPrimaryTokenId(primaryTokenId)
+        .setShouldLoadWallet(false)
+
     fun loadTokenPrimary(): String? {
         return localRepository.loadTokenPrimary()
     }
diff --git a/app/src/main/java/network/omisego/omgwallet/screen/auth/confirm/ConfirmTransactionRequestFragment.kt b/app/src/main/java/network/omisego/omgwallet/screen/auth/confirm/ConfirmTransactionRequestFragment.kt
new file mode 100644
index 0000000..6de7d8a
--- /dev/null
+++ b/app/src/main/java/network/omisego/omgwallet/screen/auth/confirm/ConfirmTransactionRequestFragment.kt
@@ -0,0 +1,54 @@
+package network.omisego.omgwallet.screen.auth.confirm
+
+/*
+ * OmiseGO
+ *
+ * Created by Phuchit Sirimongkolsathien on 18/10/2018 AD.
+ * Copyright © 2017-2018 OmiseGO. All rights reserved.
+ */
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.databinding.DataBindingUtil
+import androidx.fragment.app.Fragment
+import co.omisego.omisego.model.APIError
+import co.omisego.omisego.model.transaction.consumption.TransactionConsumption
+import network.omisego.omgwallet.R
+import network.omisego.omgwallet.databinding.FragmentConfirmTransactionRequestBinding
+import network.omisego.omgwallet.extension.provideAndroidViewModel
+import network.omisego.omgwallet.livedata.EventObserver
+
+class ConfirmTransactionRequestFragment : Fragment() {
+    private lateinit var binding: FragmentConfirmTransactionRequestBinding
+    private lateinit var viewModel: ConfirmTransactionRequestViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        viewModel = provideAndroidViewModel()
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_confirm_transaction_request, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val txConsumption = ConfirmTransactionRequestFragmentArgs.fromBundle(arguments).transactionConsumption
+        binding.setLifecycleOwner(this)
+        binding.viewModel = viewModel
+        binding.txConsumption = txConsumption
+
+        viewModel.formatAmount(txConsumption)
+        viewModel.formatSendTo(txConsumption)
+        viewModel.liveResult.observe(this, EventObserver { result ->
+            result.handle<TransactionConsumption>({}, this::handleApproveResult)
+        })
+    }
+
+    private fun handleApproveResult(error: APIError) {
+        viewModel.formatApproveError(error)
+    }
+}
diff --git a/app/src/main/java/network/omisego/omgwallet/screen/auth/confirm/ConfirmTransactionRequestViewModel.kt b/app/src/main/java/network/omisego/omgwallet/screen/auth/confirm/ConfirmTransactionRequestViewModel.kt
new file mode 100644
index 0000000..cd56631
--- /dev/null
+++ b/app/src/main/java/network/omisego/omgwallet/screen/auth/confirm/ConfirmTransactionRequestViewModel.kt
@@ -0,0 +1,70 @@
+package network.omisego.omgwallet.screen.auth.confirm
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.MutableLiveData
+import co.omisego.omisego.constant.enums.ErrorCode
+import co.omisego.omisego.model.APIError
+import co.omisego.omisego.model.transaction.consumption.TransactionConsumption
+import network.omisego.omgwallet.R
+import network.omisego.omgwallet.data.LocalRepository
+import network.omisego.omgwallet.data.RemoteRepository
+import network.omisego.omgwallet.livedata.Event
+import network.omisego.omgwallet.model.APIResult
+
+/*
+ * OmiseGO
+ *
+ * Created by Phuchit Sirimongkolsathien on 18/10/2018 AD.
+ * Copyright © 2017-2018 OmiseGO. All rights reserved.
+ */
+
+class ConfirmTransactionRequestViewModel(
+    val app: Application,
+    private val localRepository: LocalRepository,
+    private val remoteRepository: RemoteRepository
+) : AndroidViewModel(app) {
+    private var txConsumptionApprove: TransactionConsumption? = null
+    val liveAmountText: MutableLiveData<String> by lazy { MutableLiveData<String>() }
+    val liveSendToText: MutableLiveData<String> by lazy { MutableLiveData<String>() }
+    val liveErrorDescription: MutableLiveData<String> by lazy { MutableLiveData<String>() }
+    val liveResult: MutableLiveData<Event<APIResult>> by lazy { MutableLiveData<Event<APIResult>>() }
+
+    fun formatAmount(txConsumption: TransactionConsumption) {
+        liveAmountText.value = app.getString(
+            R.string.confirm_transaction_request_amount,
+            txConsumption.estimatedRequestAmount.divide(txConsumption.transactionRequest.token.subunitToUnit),
+            txConsumption.transactionRequest.token.symbol
+        )
+    }
+
+    fun formatSendTo(txConsumption: TransactionConsumption) {
+        liveSendToText.value = app.getString(
+            R.string.confirm_transaction_request_to,
+            txConsumption.account?.name
+        )
+    }
+
+    fun formatApproveError(error: APIError) {
+        liveErrorDescription.value = if (error.code == ErrorCode.TRANSACTION_INSUFFICIENT_FUNDS) {
+            val tokenId = txConsumptionApprove?.token?.id
+            val balances = localRepository.loadWallet()?.data?.get(0)?.balances
+            app.getString(
+                R.string.confirm_transaction_request_error_not_has_enough_fund,
+                balances?.findLast { it.token.id == tokenId }?.displayAmount(2),
+                txConsumptionApprove?.token?.symbol
+            )
+        } else {
+            error.description
+        }
+    }
+
+    fun handleApproveClick(txConsumption: TransactionConsumption) {
+        txConsumptionApprove = txConsumption
+        remoteRepository.approveTransaction(txConsumption.id, liveResult)
+    }
+
+    fun handleRejectClick(txConsumption: TransactionConsumption) {
+        remoteRepository.rejectTransaction(txConsumption.id, liveResult)
+    }
+}
diff --git a/app/src/main/java/network/omisego/omgwallet/screen/auth/profile/main/ProfileViewModel.kt b/app/src/main/java/network/omisego/omgwallet/screen/auth/profile/main/ProfileViewModel.kt
index 6f6cf2c..d313291 100644
--- a/app/src/main/java/network/omisego/omgwallet/screen/auth/profile/main/ProfileViewModel.kt
+++ b/app/src/main/java/network/omisego/omgwallet/screen/auth/profile/main/ProfileViewModel.kt
@@ -13,13 +13,15 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import co.infinum.goldfinger.Goldfinger
 import network.omisego.omgwallet.data.LocalRepository
+import network.omisego.omgwallet.data.RemoteRepository
 import network.omisego.omgwallet.livedata.Event
 import network.omisego.omgwallet.network.ClientProvider
 import network.omisego.omgwallet.state.FingerprintDialogState
 
 class ProfileViewModel(
     private val app: Application,
-    private val localRepository: LocalRepository
+    private val localRepository: LocalRepository,
+    private val remoteRepository: RemoteRepository
 ) : AndroidViewModel(app) {
     val liveFingerprintDialogState: MutableLiveData<FingerprintDialogState> by lazy { MutableLiveData<FingerprintDialogState>() }
     val liveTransaction: MutableLiveData<Event<View>> by lazy { MutableLiveData<Event<View>>() }
@@ -29,6 +31,7 @@ class ProfileViewModel(
 
     fun clickSignout(view: View) {
         localRepository.clearSession()
+        remoteRepository.stopListeningToUserSocketEvent()
         liveSignout.value = Event(view)
     }
 
diff --git a/app/src/main/java/network/omisego/omgwallet/screen/auth/profile/transaction/TransactionListTransformer.kt b/app/src/main/java/network/omisego/omgwallet/screen/auth/profile/transaction/TransactionListTransformer.kt
index 0aea876..37bbabb 100644
--- a/app/src/main/java/network/omisego/omgwallet/screen/auth/profile/transaction/TransactionListTransformer.kt
+++ b/app/src/main/java/network/omisego/omgwallet/screen/auth/profile/transaction/TransactionListTransformer.kt
@@ -52,11 +52,19 @@ class TransactionListTransformer(
     }
 
     fun transformAmount(transaction: Transaction): String {
-        val amountText = context.getString(
-            R.string.transaction_list_info_amount,
-            transaction.from.amount.divide(transaction.from.token.subunitToUnit),
-            transaction.from.token.symbol
-        )
+        val amountText = if (transaction.isTopup) {
+            context.getString(
+                R.string.transaction_list_info_amount,
+                transaction.to.amount.divide(transaction.to.token.subunitToUnit),
+                transaction.to.token.symbol
+            )
+        } else {
+            context.getString(
+                R.string.transaction_list_info_amount,
+                transaction.from.amount.divide(transaction.from.token.subunitToUnit),
+                transaction.from.token.symbol
+            )
+        }
         return when (transaction.status) {
             Paginable.Transaction.TransactionStatus.CONFIRMED -> {
                 if (transaction.to.accountId != null) {
diff --git a/app/src/main/java/network/omisego/omgwallet/screen/auth/profile/transaction/TransactionListViewModel.kt b/app/src/main/java/network/omisego/omgwallet/screen/auth/profile/transaction/TransactionListViewModel.kt
index 73a6c2d..4f35d48 100644
--- a/app/src/main/java/network/omisego/omgwallet/screen/auth/profile/transaction/TransactionListViewModel.kt
+++ b/app/src/main/java/network/omisego/omgwallet/screen/auth/profile/transaction/TransactionListViewModel.kt
@@ -8,6 +8,7 @@ package network.omisego.omgwallet.screen.auth.profile.transaction
  */
 
 import android.app.Application
+import android.os.Bundle
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import co.omisego.omisego.model.Wallet
@@ -43,6 +44,8 @@ class TransactionListViewModel(
         binding.transformer = transformer
     }
 
+    override fun resolvePayloadBundle(bundle: Bundle): Transaction? = null
+
     fun giveTransactionStatusDescription(transaction: Transaction) {
         transaction.error?.let {
             liveTransactionFailedDescription.value = transaction.error?.description
diff --git a/app/src/main/java/network/omisego/omgwallet/screen/auth/showqr/ShowQRViewModel.kt b/app/src/main/java/network/omisego/omgwallet/screen/auth/showqr/ShowQRViewModel.kt
index f942afe..baf4580 100644
--- a/app/src/main/java/network/omisego/omgwallet/screen/auth/showqr/ShowQRViewModel.kt
+++ b/app/src/main/java/network/omisego/omgwallet/screen/auth/showqr/ShowQRViewModel.kt
@@ -13,6 +13,7 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import co.omisego.omisego.qrcode.generator.QRGenerator
 import network.omisego.omgwallet.data.LocalRepository
+import network.omisego.omgwallet.extension.logi
 
 class ShowQRViewModel(
     val app: Application,
@@ -27,8 +28,9 @@ class ShowQRViewModel(
     }
 
     fun createQRBitmap() {
-        val address = localRepository.loadWallet()!!.data[0].address
+        val sendReceiveFormattedId = localRepository.loadTransactionRequestFormattedId()
+        logi("Encoded [$sendReceiveFormattedId] to the QR code")
         val size = app.resources.displayMetrics.widthPixels * RATIO_QR_WIDTH_TO_SCREEN
-        liveQR.value = generator.generate(address, size.toInt())
+        liveQR.value = generator.generate(sendReceiveFormattedId, size.toInt())
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/network/omisego/omgwallet/screen/auth/splash/PreloadResourceViewModel.kt b/app/src/main/java/network/omisego/omgwallet/screen/auth/splash/PreloadResourceViewModel.kt
index b28b8dc..545bf68 100644
--- a/app/src/main/java/network/omisego/omgwallet/screen/auth/splash/PreloadResourceViewModel.kt
+++ b/app/src/main/java/network/omisego/omgwallet/screen/auth/splash/PreloadResourceViewModel.kt
@@ -7,25 +7,125 @@ package network.omisego.omgwallet.screen.auth.splash
  * Copyright © 2017-2018 OmiseGO. All rights reserved.
  */
 
+import android.app.Application
+import android.view.View
+import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
+import co.omisego.omisego.model.APIError
+import co.omisego.omisego.model.Balance
+import co.omisego.omisego.model.Token
 import co.omisego.omisego.model.WalletList
+import co.omisego.omisego.model.transaction.request.TransactionRequestCreateParams
+import co.omisego.omisego.model.transaction.request.TransactionRequestType
+import co.omisego.omisego.model.transaction.request.TransactionRequestType.RECEIVE
+import co.omisego.omisego.model.transaction.request.TransactionRequestType.SEND
+import kotlinx.coroutines.experimental.android.UI
+import kotlinx.coroutines.experimental.async
+import kotlinx.coroutines.experimental.launch
+import network.omisego.omgwallet.R
 import network.omisego.omgwallet.data.LocalRepository
 import network.omisego.omgwallet.data.RemoteRepository
+import network.omisego.omgwallet.extension.either
+import network.omisego.omgwallet.extension.logi
 import network.omisego.omgwallet.livedata.Event
 import network.omisego.omgwallet.model.APIResult
+import network.omisego.omgwallet.util.IdlingResourceUtil
+import java.math.BigDecimal
 
 class PreloadResourceViewModel(
+    private val app: Application,
     private val localRepository: LocalRepository,
     private val remoteRepository: RemoteRepository
-) : ViewModel() {
-    val liveResult: MutableLiveData<Event<APIResult>> by lazy { MutableLiveData<Event<APIResult>>() }
+) : AndroidViewModel(app) {
+    val liveResult by lazy { MutableLiveData<Event<APIResult>>() }
+    val liveTransactionRequestPrimaryTokenId by lazy { MutableLiveData<Event<String>>() }
+    val liveCreateTransactionRequestFailed by lazy { MutableLiveData<Event<APIError>>() }
+    val liveStatus by lazy { MutableLiveData<String>() }
+    val liveCloseButtonVisibility by lazy { MutableLiveData<Int>() }
+
+    fun displayTokenPrimaryNotify(balance: Balance?): String {
+        return app.getString(
+            R.string.balance_detail_primary_token_set_notify,
+            balance?.token?.symbol
+        )
+    }
+
+    fun loadBalances() = localRepository.loadWallet()?.data?.get(0)?.balances!!
+
+    fun loadWalletLocally() {
+        liveCloseButtonVisibility.value = View.GONE
+        localRepository.loadWallet(liveResult)
+    }
 
     fun loadWallets() {
-        remoteRepository.loadWallet(liveResult, true)
+        liveCloseButtonVisibility.value = View.GONE
+        remoteRepository.loadWallet(liveResult)
+        liveStatus.value = app.getString(R.string.splash_status_loading_wallet)
     }
 
     fun saveWallet(data: WalletList) {
         localRepository.saveWallets(data)
     }
+
+    fun createTransactionRequest(walletList: WalletList, primaryTokenId: String?) {
+        /* Update splash loading message */
+        liveStatus.value = app.getString(R.string.splash_status_creating_transaction)
+
+        /* Find the token to be used for send or receive */
+        val selectedToken = selectPrimaryToken(walletList, primaryTokenId)
+
+        val params = createTransactionRequestCreateParams(selectedToken)
+
+        val formattedIds: MutableMap<TransactionRequestType, String> = mutableMapOf()
+
+        IdlingResourceUtil.idlingResource.increment()
+        launch(UI) {
+            val result = async {
+                val txReceiveResult = remoteRepository.createTransactionRequest(params)
+                val txSendResult = remoteRepository.createTransactionRequest(
+                    params.copy(type = SEND, requireConfirmation = true)
+                )
+                return@async txReceiveResult to txSendResult
+            }
+            val (txReceive, txSend) = result.await()
+            txReceive.either({ formattedIds[RECEIVE] = it.data.formattedId }, this@PreloadResourceViewModel::handleAPIError)
+            txSend.either({ formattedIds[SEND] = it.data.formattedId }, this@PreloadResourceViewModel::handleAPIError)
+
+            if (formattedIds.size == 2) {
+                val message = "${formattedIds[RECEIVE]}|${formattedIds[SEND]}"
+                logi(message)
+
+                localRepository.saveTransactionRequestFormattedId(formattedIds)
+                localRepository.saveTokenPrimary(selectedToken)
+
+                /* Emit success event */
+                liveTransactionRequestPrimaryTokenId.value = Event(selectedToken.id)
+                IdlingResourceUtil.idlingResource.decrement()
+            }
+        }
+    }
+
+    // Select the token by priority:
+    // 1. Select the token that matched with the `primaryTokenId`.
+    // 2. Select the highest-amount token.
+    // 3. Select the first token.
+    fun selectPrimaryToken(walletList: WalletList, primaryTokenId: String?): Token {
+        val theHighestBalance: (Balance) -> BigDecimal = { it.amount.divide(it.token.subunitToUnit) }
+        return walletList.data[0].balances.find { it.token.id == primaryTokenId }?.token
+            ?: walletList.data[0].balances.maxBy(theHighestBalance)?.token
+            ?: walletList.data[0].balances[0].token
+    }
+
+    fun createTransactionRequestCreateParams(token: Token): TransactionRequestCreateParams {
+        return TransactionRequestCreateParams(
+            RECEIVE,
+            token.id,
+            requireConfirmation = false
+        )
+    }
+
+    fun handleAPIError(apiError: APIError) {
+        liveCreateTransactionRequestFailed.value = Event(apiError)
+        liveCloseButtonVisibility.value = View.VISIBLE
+    }
 }
diff --git a/app/src/main/java/network/omisego/omgwallet/screen/auth/splash/SplashFragment.kt b/app/src/main/java/network/omisego/omgwallet/screen/auth/splash/SplashFragment.kt
index 54961e2..d3b6c7f 100644
--- a/app/src/main/java/network/omisego/omgwallet/screen/auth/splash/SplashFragment.kt
+++ b/app/src/main/java/network/omisego/omgwallet/screen/auth/splash/SplashFragment.kt
@@ -11,23 +11,28 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.findNavController
 import co.omisego.omisego.model.APIError
 import co.omisego.omisego.model.WalletList
+import kotlinx.android.synthetic.main.fragment_splash.*
 import network.omisego.omgwallet.R
 import network.omisego.omgwallet.databinding.FragmentSplashBinding
 import network.omisego.omgwallet.extension.bindingInflate
-import network.omisego.omgwallet.extension.provideViewModel
+import network.omisego.omgwallet.extension.provideAndroidViewModel
 import network.omisego.omgwallet.extension.toast
 import network.omisego.omgwallet.livedata.EventObserver
 
 class SplashFragment : Fragment() {
     private lateinit var binding: FragmentSplashBinding
     private lateinit var viewModel: PreloadResourceViewModel
+    private lateinit var args: SplashFragmentArgs
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        viewModel = provideViewModel()
+        viewModel = provideAndroidViewModel()
+        args = SplashFragmentArgs.fromBundle(arguments)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -37,18 +42,45 @@ class SplashFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        viewModel.loadWallets()
+        setupDataBinding()
+        observeLiveData()
+        btnClose.setOnClickListener {
+            findNavController().navigateUp()
+        }
+
+        if (args.shouldLoadWallet) {
+            viewModel.loadWallets()
+        } else {
+            viewModel.loadWalletLocally()
+        }
+    }
+
+    private fun setupDataBinding() {
+        binding.viewModel = viewModel
+        binding.setLifecycleOwner(this)
+    }
+
+    private fun observeLiveData() {
         viewModel.liveResult.observe(this, EventObserver {
             it.handle(this::handleLoadWalletSuccess, this::handleLoadWalletFail)
-//            findNavController().navigate(R.id.action_splashFragment_to_authFragment)
+        })
+        viewModel.liveTransactionRequestPrimaryTokenId.observe(this, EventObserver { primaryTokenId ->
+            val balance = viewModel.loadBalances().find { it.token.id == primaryTokenId }
+            context?.toast(viewModel.displayTokenPrimaryNotify(balance))
+            findNavController().navigateUp()
+        })
+        viewModel.liveCreateTransactionRequestFailed.observe(this, EventObserver {
+            context?.toast(it.description, Toast.LENGTH_LONG)
+            tvCurrentStatus.text = it.description
         })
     }
 
     private fun handleLoadWalletSuccess(data: WalletList) {
         viewModel.saveWallet(data)
+        viewModel.createTransactionRequest(data, args.primaryTokenId)
     }
 
     private fun handleLoadWalletFail(error: APIError) {
-        context?.toast(error.description)
+        viewModel.handleAPIError(error)
     }
 }
diff --git a/app/src/main/java/network/omisego/omgwallet/screen/unauth/SignInFragment.kt b/app/src/main/java/network/omisego/omgwallet/screen/unauth/SignInFragment.kt
index 5f67aac..b2b49bc 100644
--- a/app/src/main/java/network/omisego/omgwallet/screen/unauth/SignInFragment.kt
+++ b/app/src/main/java/network/omisego/omgwallet/screen/unauth/SignInFragment.kt
@@ -48,6 +48,7 @@ class SignInFragment : Fragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         viewModel = provideAndroidViewModel()
+        fingerprintViewModel = provideAndroidViewModel()
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -60,8 +61,9 @@ class SignInFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        fingerprintViewModel = provideAndroidViewModel()
-        takeNavigation()
+        if (viewModel.hasAuthenticationToken()) {
+            findNavController().navigate(R.id.action_signInFragment_to_authFragment)
+        }
 
         ivLogo.setImageDrawable(ContextCompat.getDrawable(ivLogo.context, R.drawable.omisego_logo_no_animated))
 
@@ -96,14 +98,6 @@ class SignInFragment : Fragment() {
         runOnMToP { subscribeSignInWithFingerprintBelowP() }
     }
 
-    private fun takeNavigation() {
-        val wallets = viewModel.loadWallets()
-        val hasAuthToken = viewModel.hasAuthenticationToken()
-        when {
-            hasAuthToken -> findNavController().navigate(R.id.action_signInFragment_to_authFragment)
-        }
-    }
-
     @RequiresApi(Build.VERSION_CODES.P)
     private fun subscribeSignInWithFingerprintP() {
         viewModel.liveAuthenticationSucceeded.observe(this, Observer {
diff --git a/app/src/main/java/network/omisego/omgwallet/screen/unauth/signin/SignInViewModel.kt b/app/src/main/java/network/omisego/omgwallet/screen/unauth/signin/SignInViewModel.kt
index aacf353..1fd50c0 100644
--- a/app/src/main/java/network/omisego/omgwallet/screen/unauth/signin/SignInViewModel.kt
+++ b/app/src/main/java/network/omisego/omgwallet/screen/unauth/signin/SignInViewModel.kt
@@ -159,10 +159,7 @@ class SignInViewModel(
     }
 
     fun saveUserEmail(email: String) {
-        if (email != localRepository.loadUserEmail()) {
-            localRepository.deleteFingerprintCredential()
-            localRepository.saveFingerprintOption(false)
-        }
+        localRepository.clearOldAccountCache(email)
         localRepository.saveUserEmail(email)
     }
 
diff --git a/app/src/main/java/network/omisego/omgwallet/storage/Storage.kt b/app/src/main/java/network/omisego/omgwallet/storage/Storage.kt
index 509b976..6e7c2db 100644
--- a/app/src/main/java/network/omisego/omgwallet/storage/Storage.kt
+++ b/app/src/main/java/network/omisego/omgwallet/storage/Storage.kt
@@ -12,6 +12,7 @@ import android.content.SharedPreferences
 import co.omisego.omisego.model.Token
 import co.omisego.omisego.model.User
 import co.omisego.omisego.model.WalletList
+import co.omisego.omisego.model.transaction.request.TransactionRequestType
 import co.omisego.omisego.security.OMGKeyManager
 import co.omisego.omisego.utils.GsonProvider
 import kotlinx.coroutines.experimental.Deferred
@@ -93,6 +94,10 @@ object Storage {
         return gson.fromJson<WalletList>(sharePref[StorageKey.KEY_WALLET], WalletList::class.java)
     }
 
+    fun deleteWallets() {
+        sharePref.edit()?.remove(StorageKey.KEY_WALLET)?.apply()
+    }
+
     fun saveUser(user: User) {
         sharePref[StorageKey.KEY_USER] = gson.toJson(user)
     }
@@ -106,22 +111,52 @@ object Storage {
         sharePref[StorageKey.KEY_TOKEN_PRIMARY] = token.id
     }
 
+    fun deleteTokenPrimary() {
+        sharePref.edit().remove(StorageKey.KEY_TOKEN_PRIMARY).apply()
+    }
+
     fun loadTokenPrimary(): String? {
         if (sharePref[StorageKey.KEY_TOKEN_PRIMARY].isNullOrEmpty()) return null
         return sharePref[StorageKey.KEY_TOKEN_PRIMARY]
     }
 
+    fun hasFormattedId() = sharePref.contains(StorageKey.KEY_TRANSACTION_REQUEST_FORMATTED_ID_RECEIVE)
+        && sharePref.contains(StorageKey.KEY_TRANSACTION_REQUEST_FORMATTED_ID_SEND)
+
+    fun saveFormattedId(formattedIds: Map<TransactionRequestType, String>) {
+        sharePref[StorageKey.KEY_TRANSACTION_REQUEST_FORMATTED_ID_SEND] = formattedIds[TransactionRequestType.SEND]!!
+        sharePref[StorageKey.KEY_TRANSACTION_REQUEST_FORMATTED_ID_RECEIVE] = formattedIds[TransactionRequestType.RECEIVE]!!
+    }
+
+    /* Returns send|receive */
+    fun loadFormattedId(): String =
+        "${sharePref[StorageKey.KEY_TRANSACTION_REQUEST_FORMATTED_ID_RECEIVE]}|${sharePref[StorageKey.KEY_TRANSACTION_REQUEST_FORMATTED_ID_SEND]}"
+
+    fun deleteFormattedIds() {
+        sharePref.edit()
+            .remove(StorageKey.KEY_TRANSACTION_REQUEST_FORMATTED_ID_SEND)
+            .remove(StorageKey.KEY_TRANSACTION_REQUEST_FORMATTED_ID_RECEIVE)
+            .apply()
+    }
+
     fun clearSession() {
         sharePref.edit()
             .remove(StorageKey.KEY_AUTHENTICATION_TOKEN)
             .remove(StorageKey.KEY_WALLET)
             .remove(StorageKey.KEY_USER)
+            .remove(StorageKey.KEY_TRANSACTION_REQUEST_FORMATTED_ID_RECEIVE)
+            .remove(StorageKey.KEY_TRANSACTION_REQUEST_FORMATTED_ID_SEND)
             .apply()
     }
 
-    fun removeWallet() {
-        sharePref.edit()
-            .remove(StorageKey.KEY_WALLET)
-            .apply()
+    fun clearOldAccountCache(email: String) {
+        if (email != sharePref[StorageKey.KEY_USER_EMAIL]) {
+            sharePref.edit()
+                .remove(StorageKey.KEY_TOKEN_PRIMARY)
+                .remove(StorageKey.KEY_WALLET)
+                .remove(StorageKey.KEY_FINGERPRINT_USER_PASSWORD)
+                .remove(StorageKey.KEY_FINGERPRINT_OPTION)
+                .apply()
+        }
     }
 }
diff --git a/app/src/main/java/network/omisego/omgwallet/storage/StorageKey.kt b/app/src/main/java/network/omisego/omgwallet/storage/StorageKey.kt
index 1e8ef43..df76824 100644
--- a/app/src/main/java/network/omisego/omgwallet/storage/StorageKey.kt
+++ b/app/src/main/java/network/omisego/omgwallet/storage/StorageKey.kt
@@ -15,4 +15,6 @@ object StorageKey {
     const val KEY_USER_EMAIL = "user_email"
     const val KEY_FINGERPRINT_USER_PASSWORD = "fingerprint_user_password"
     const val KEY_TOKEN_PRIMARY = "token_primary"
+    const val KEY_TRANSACTION_REQUEST_FORMATTED_ID_RECEIVE = "transaction_request_formatted_id_receive"
+    const val KEY_TRANSACTION_REQUEST_FORMATTED_ID_SEND = "transaction_request_formatted_id_send"
 }
diff --git a/app/src/main/java/network/omisego/omgwallet/util/IdlingResourceUtil.kt b/app/src/main/java/network/omisego/omgwallet/util/IdlingResourceUtil.kt
new file mode 100644
index 0000000..80a2458
--- /dev/null
+++ b/app/src/main/java/network/omisego/omgwallet/util/IdlingResourceUtil.kt
@@ -0,0 +1,16 @@
+package network.omisego.omgwallet.util
+
+import androidx.test.espresso.idling.CountingIdlingResource
+
+/*
+ * OmiseGO
+ *
+ * Created by Phuchit Sirimongkolsathien on 21/10/2018 AD.
+ * Copyright © 2017-2018 OmiseGO. All rights reserved.
+ */
+
+object IdlingResourceUtil {
+    val idlingResource: CountingIdlingResource by lazy {
+        CountingIdlingResource("coroutines", true)
+    }
+}
diff --git a/app/src/main/java/network/omisego/omgwallet/view/BottomBarItem.kt b/app/src/main/java/network/omisego/omgwallet/view/BottomBarItem.kt
deleted file mode 100644
index efc2545..0000000
--- a/app/src/main/java/network/omisego/omgwallet/view/BottomBarItem.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package network.omisego.omgwallet.view
-
-/*
- * OmiseGO
- *
- * Created by Phuchit Sirimongkolsathien on 21/9/2018 AD.
- * Copyright © 2017-2018 OmiseGO. All rights reserved.
- */
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import androidx.constraintlayout.widget.ConstraintLayout
-import kotlinx.android.synthetic.main.view_menu_bottom_bar.view.*
-import network.omisego.omgwallet.R
-
-class BottomBarItem @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
-) : ConstraintLayout(context, attrs, defStyleAttr) {
-
-    init {
-        LayoutInflater.from(context).inflate(R.layout.view_menu_bottom_bar, this, true)
-        attrs?.let { attr ->
-            val typedArray = context.obtainStyledAttributes(attr, R.styleable.BottomBarItem, 0, 0)
-            val itemName = typedArray.getString(R.styleable.BottomBarItem_bb_title)
-            val icon = typedArray.getString(R.styleable.BottomBarItem_bb_icon)
-            itemName?.let { tvItemName.text = it }
-            icon?.let { tvIcon.text = it }
-            typedArray.recycle()
-        }
-        select(false)
-    }
-
-    fun select(isSelect: Boolean) {
-        tvItemName.isSelected = isSelect
-        tvIcon.isSelected = isSelect
-    }
-
-    override fun setOnClickListener(l: OnClickListener?) {
-        container.setOnClickListener(l)
-    }
-
-    override fun setSelected(selected: Boolean) {
-        select(selected)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/animator/item_animation_balance_amount.xml b/app/src/main/res/animator/item_animation_balance_amount.xml
new file mode 100644
index 0000000..287cbbe
--- /dev/null
+++ b/app/src/main/res/animator/item_animation_balance_amount.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@android:integer/config_longAnimTime"
+    android:ordering="together">
+
+    <!-- Move -->
+    <set android:ordering="sequentially">
+        <objectAnimator
+            android:interpolator="@android:anim/accelerate_interpolator"
+            android:propertyName="translationY"
+            android:valueFrom="0"
+            android:valueTo="-50" />
+        <objectAnimator
+            android:interpolator="@android:anim/decelerate_interpolator"
+            android:propertyName="translationY"
+            android:valueFrom="50"
+            android:valueTo="0" />
+    </set>
+
+    <!-- Fade -->
+    <set android:ordering="sequentially">
+        <objectAnimator
+            android:interpolator="@android:anim/accelerate_interpolator"
+            android:propertyName="alpha"
+            android:valueFrom="1"
+            android:valueTo="0" />
+        <objectAnimator
+            android:interpolator="@android:anim/decelerate_interpolator"
+            android:propertyName="alpha"
+            android:valueFrom="0"
+            android:valueTo="1" />
+    </set>
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/go.png b/app/src/main/res/drawable-hdpi/go.png
new file mode 100644
index 0000000..8dc87d5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/go.png differ
diff --git a/app/src/main/res/drawable-mdpi/go.png b/app/src/main/res/drawable-mdpi/go.png
new file mode 100644
index 0000000..29aaf0a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/go.png differ
diff --git a/app/src/main/res/drawable-xhdpi/go.png b/app/src/main/res/drawable-xhdpi/go.png
new file mode 100644
index 0000000..b2ef9af
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/go.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/go.png b/app/src/main/res/drawable-xxhdpi/go.png
new file mode 100644
index 0000000..ffd4597
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/go.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/go.png b/app/src/main/res/drawable-xxxhdpi/go.png
new file mode 100644
index 0000000..67f00c3
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/go.png differ
diff --git a/app/src/main/res/drawable/splash.xml b/app/src/main/res/drawable/splash.xml
new file mode 100644
index 0000000..11975b5
--- /dev/null
+++ b/app/src/main/res/drawable/splash.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/colorWhiteWeak" />
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/go" />
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_balance.xml b/app/src/main/res/layout/fragment_balance.xml
index 4e13c70..cf0d26f 100644
--- a/app/src/main/res/layout/fragment_balance.xml
+++ b/app/src/main/res/layout/fragment_balance.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
+
         <variable
             name="paddingRect"
             type="android.graphics.Rect" />
diff --git a/app/src/main/res/layout/fragment_confirm_transaction_request.xml b/app/src/main/res/layout/fragment_confirm_transaction_request.xml
new file mode 100644
index 0000000..4708436
--- /dev/null
+++ b/app/src/main/res/layout/fragment_confirm_transaction_request.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+    <data>
+
+        <variable
+            name="viewModel"
+            type="network.omisego.omgwallet.screen.auth.confirm.ConfirmTransactionRequestViewModel" />
+
+        <variable
+            name="txConsumption"
+            type="co.omisego.omisego.model.transaction.consumption.TransactionConsumption" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tvTokenFrom"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="48dp"
+            android:layout_marginEnd="8dp"
+            android:text="@string/confirm_transaction_request_send"
+            android:textColor="?attr/colorPrimary"
+            android:textSize="20sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.498"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Send" />
+
+        <TextView
+            android:id="@+id/tvAmount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="56dp"
+            android:layout_marginEnd="8dp"
+            android:text="@{viewModel.liveAmountText}"
+            android:textSize="24sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvTokenFrom"
+            tools:text="300,000 OMG" />
+
+
+        <TextView
+            android:id="@+id/tvErrorDescription"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="8dp"
+            android:gravity="center"
+            android:text="@{viewModel.liveErrorDescription}"
+            android:textColor="@color/colorRedWeak2"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvTokenTo"
+            app:layout_constraintVertical_bias="0.36"
+            tools:text="Some error text will appear here Some error text will appear here. Some error text will appear here. Some error text will appear here." />
+
+        <TextView
+            android:id="@+id/tvTokenTo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="56dp"
+            android:layout_marginEnd="8dp"
+            android:text="@{viewModel.liveSendToText}"
+            android:textColor="?attr/colorPrimary"
+            android:textSize="20sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvAmount"
+            tools:text="To Omise" />
+
+        <Button
+            android:id="@+id/btnApprove"
+            style="@style/OMGTextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp"
+            android:onClick="@{() -> viewModel.handleApproveClick(txConsumption)}"
+            android:text="@string/confirm_transaction_request_approve"
+            android:textColor="@color/colorBlue"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <Button
+            android:id="@+id/btnReject"
+            style="@style/OMGTextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginBottom="8dp"
+            android:onClick="@{() -> viewModel.handleRejectClick(txConsumption)}"
+            android:text="@string/confirm_transaction_request_reject"
+            android:textColor="@color/colorGrayWeak"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/app/src/main/res/layout/fragment_authenticated.xml b/app/src/main/res/layout/fragment_main.xml
similarity index 71%
rename from app/src/main/res/layout/fragment_authenticated.xml
rename to app/src/main/res/layout/fragment_main.xml
index 2a31d24..26344f7 100644
--- a/app/src/main/res/layout/fragment_authenticated.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -6,22 +6,21 @@
     <data></data>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/layoutContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?attr/colorPrimary"
                 android:minHeight="?attr/actionBarSize"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
                 app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
                 app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
                 app:titleTextColor="@color/colorWhite"
@@ -30,13 +29,10 @@
             <fragment
                 android:id="@+id/content"
                 android:name="androidx.navigation.fragment.NavHostFragment"
-                android:layout_width="409dp"
+                android:layout_width="match_parent"
                 android:layout_height="0dp"
+                android:layout_weight="1"
                 app:defaultNavHost="true"
-                app:layout_constraintBottom_toTopOf="@+id/bottomNavigation"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/toolbar"
                 app:navGraph="@navigation/graph_main" />
 
             <com.google.android.material.bottomnavigation.BottomNavigationView
@@ -45,12 +41,9 @@
                 android:layout_height="wrap_content"
                 app:itemIconTint="@color/color_bottom_bar_text_selector"
                 app:itemTextColor="@color/color_bottom_bar_text_selector"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
                 app:menu="@menu/bottom_navigation" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fabQR"
@@ -60,6 +53,7 @@
             android:stateListAnimator="@animator/animator_state_button"
             app:layout_anchor="@+id/bottomNavigation"
             app:layout_anchorGravity="center_horizontal"
+            app:layout_behavior=".custom.MoveUpBehavior"
             app:rippleColor="@color/transparent" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_splash.xml b/app/src/main/res/layout/fragment_splash.xml
index 68af967..a833305 100644
--- a/app/src/main/res/layout/fragment_splash.xml
+++ b/app/src/main/res/layout/fragment_splash.xml
@@ -6,6 +6,10 @@
     <data>
 
         <import type="network.omisego.omgwallet.R" />
+
+        <variable
+            name="viewModel"
+            type="network.omisego.omgwallet.screen.auth.splash.PreloadResourceViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -14,13 +18,51 @@
 
         <ImageView
             android:id="@+id/imageView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginBottom="14dp"
+            app:layout_constraintBottom_toTopOf="@+id/tvCurrentStatus"
+            app:layout_constraintDimensionRatio="H,1:1"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed"
+            app:layout_constraintWidth_percent="0.5"
             app:loadGif="@{R.raw.go_loading}"
             tools:srcCompat="@tools:sample/avatars" />
+
+        <TextView
+            android:id="@+id/tvCurrentStatus"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="16dp"
+            android:gravity="center"
+            android:text="@{viewModel.liveStatus}"
+            android:textColor="@color/colorGrayWeak"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/imageView"
+            tools:text="dasfjkdsfklasmflkdsfmkladsfmksdlfmksdlfmdlskfmkldsmfkldsmfklsdmfkldsfmlkdsfmalfmslfkmsdlfm" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnClose"
+            style="@style/OMGTextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/splash_btn_close"
+            android:textColor="@color/colorGrayWeak"
+            android:visibility="@{viewModel.liveCloseButtonVisibility}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvCurrentStatus" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/viewholder_balance.xml b/app/src/main/res/layout/viewholder_balance.xml
index 3352111..79f562a 100644
--- a/app/src/main/res/layout/viewholder_balance.xml
+++ b/app/src/main/res/layout/viewholder_balance.xml
@@ -24,6 +24,7 @@
         android:id="@+id/layoutBalance"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:foreground="?attr/selectableItemBackgroundBorderless"
         android:onClick="@{(view) -> viewModel.handleClickBalance(balance)}">
 
         <TextView
@@ -81,7 +82,6 @@
             android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="8dp"
-            android:text="@{displayAmount}"
             android:textColor="@color/colorBlackWeak2"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/viewholder_balance_detail.xml b/app/src/main/res/layout/viewholder_balance_detail.xml
index baac0d2..064553c 100644
--- a/app/src/main/res/layout/viewholder_balance_detail.xml
+++ b/app/src/main/res/layout/viewholder_balance_detail.xml
@@ -128,7 +128,7 @@
                     tools:text="Last updated\nJune 14, 2018 11:30 AM" />
 
                 <com.google.android.material.button.MaterialButton
-                    android:id="@+id/materialButton"
+                    android:id="@+id/btnSetPrimary"
                     style="@style/OMGTextButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/navigation/graph_authentication.xml b/app/src/main/res/navigation/graph_authentication.xml
index a78574f..fc78400 100644
--- a/app/src/main/res/navigation/graph_authentication.xml
+++ b/app/src/main/res/navigation/graph_authentication.xml
@@ -43,9 +43,9 @@
 
     <fragment
         android:id="@+id/authFragment"
-        android:name="network.omisego.omgwallet.screen.auth.AuthFragment"
+        android:name="network.omisego.omgwallet.screen.auth.MainFragment"
         android:label="AuthFragment"
-        tools:layout="@layout/fragment_authenticated" />
+        tools:layout="@layout/fragment_main" />
     <action
         android:id="@+id/action_global_signInFragment"
         app:destination="@id/signInFragment" />
diff --git a/app/src/main/res/navigation/graph_main.xml b/app/src/main/res/navigation/graph_main.xml
index 0925825..07126f9 100644
--- a/app/src/main/res/navigation/graph_main.xml
+++ b/app/src/main/res/navigation/graph_main.xml
@@ -27,7 +27,7 @@
         android:id="@+id/balanceDetail"
         android:name="network.omisego.omgwallet.screen.auth.balance.detail.BalanceDetailFragment"
         android:label="Detail"
-        tools:layout="@layout/fragment_balance_detail" >
+        tools:layout="@layout/fragment_balance_detail">
         <argument
             android:name="token_index"
             android:defaultValue="0"
@@ -41,9 +41,44 @@
     <fragment
         android:id="@+id/showQR"
         android:name="network.omisego.omgwallet.screen.auth.showqr.ShowQRFragment"
-        android:label="Show QR"
+        android:label="@string/show_qr_title"
         tools:layout="@layout/fragment_show_qr" />
     <action
         android:id="@+id/action_global_showQR"
         app:destination="@id/showQR" />
-</navigation>
\ No newline at end of file
+    <fragment
+        android:id="@+id/splash"
+        android:name="network.omisego.omgwallet.screen.auth.splash.SplashFragment"
+        android:label="SplashFragment"
+        tools:layout="@layout/fragment_splash">
+
+        <argument
+            android:name="primaryTokenId"
+            android:defaultValue="@null"
+            app:argType="string"
+            app:nullable="true" />
+        <argument
+            android:name="shouldLoadWallet"
+            android:defaultValue="true"
+            app:argType="boolean" />
+
+    </fragment>
+    <action
+        android:id="@+id/action_global_splash"
+        app:destination="@id/splash" />
+    <action
+        android:id="@+id/action_global_balance"
+        app:destination="@id/balance" />
+    <fragment
+        android:id="@+id/confirmTransactionRequest"
+        android:name="network.omisego.omgwallet.screen.auth.confirm.ConfirmTransactionRequestFragment"
+        android:label="@string/confirm_transaction_request_title"
+        tools:layout="@layout/fragment_confirm_transaction_request">
+        <argument
+            android:name="transactionConsumption"
+            app:argType="co.omisego.omisego.model.transaction.consumption.TransactionConsumption" />
+    </fragment>
+    <action
+        android:id="@+id/action_global_confirmTransactionRequest"
+        app:destination="@id/confirmTransactionRequest" />
+</navigation>
diff --git a/app/src/main/res/values/bottombar_item_attrs.xml b/app/src/main/res/values/bottombar_item_attrs.xml
deleted file mode 100644
index bde34d7..0000000
--- a/app/src/main/res/values/bottombar_item_attrs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <declare-styleable name="BottomBarItem">
-        <attr name="bb_icon" format="string" />
-        <attr name="bb_title" format="reference" />
-    </declare-styleable>
-</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 5b71202..cb41424 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,6 +12,11 @@
     <string name="sign_in_success">Sign in as %s successfully.</string>
     <string name="sign_in_fingerprint">Fingerprint</string>
 
+    <!-- Splash -->
+    <string name="splash_status_loading_wallet">Loading wallet…</string>
+    <string name="splash_status_creating_transaction">Creating transaction…</string>
+    <string name="splash_btn_close">Close</string>
+
     <!-- Sign Up -->
     <string name="sign_up_title">Signup</string>
     <string name="sign_up_full_name">Full name</string>
@@ -88,6 +93,19 @@
     <string name="setting_help_enable_finger_print_successfully">Enable fingerprint successfully.</string>
     <string name="setting_help_confirm">Confirm</string>
 
+    <!-- Confirm Transaction Request-->
+    <string name="confirm_transaction_request_title">Confirm Transaction Request</string>
+    <string name="confirm_transaction_request_send">Send</string>
+    <string name="confirm_transaction_request_amount">%,.2f %s</string>
+    <string name="confirm_transaction_request_to">To %s</string>
+    <string name="confirm_transaction_request_approve">Approve</string>
+    <string name="confirm_transaction_request_reject">Reject</string>
+    <string name="confirm_transaction_request_error_not_has_enough_fund">Your current account does not have enough fund (%s %s)</string>
+
+    <!-- Transaction Notification Message -->
+    <string name="notification_transaction_received">Successfully received %,.2f %s from %s</string>
+    <string name="notification_transaction_rejected">Transaction request from %s has been rejected</string>
+
     <!-- Fingerprint -->
     <string name="dialog_fingerprint_title">Sign-in</string>
     <string name="dialog_fingerprint_subtitle">Sign-in to your account</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 247448b..d1c1d5a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Global app theme -->
-    <!-- More info: https://github.com/material-components/material-components-android/blob/master/docs/theming/Color.md -->
+    <!-- More balanceInfo: https://github.com/material-components/material-components-android/blob/master/docs/theming/Color.md -->
     <style name="OMGTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
 
         <!-- Displayed most frequently across the app. -->
@@ -30,4 +30,14 @@
         <item name="textInputStyle">@style/OMGTextInputLayout</item>
         <item name="editTextStyle">@style/OMGTextInputEditText</item>
     </style>
+
+    <!-- Splash Screen theme. -->
+    <style name="SplashTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
+        <item name="colorPrimary">@color/colorGray</item>
+        <item name="colorSecondary">@color/color_omg_btn_selector</item>
+        <item name="colorPrimaryDark">@color/colorGray</item>
+        <item name="android:navigationBarColor">@color/colorGray</item>
+
+        <item name="android:windowBackground">@drawable/splash</item>
+    </style>
 </resources>