Fix after rebase

vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionInfoView.kt

@@ -184,6 +184,7 @@ class SessionInfoView @JvmOverloads constructor(
                 }
 
         views.sessionInfoLastIPAddressTextView.setTextOrHide(deviceInfo.lastSeenIp?.takeIf { isLastSeenDetailsVisible })
+        views.sessionInfoLastIPAddressTextView.text = "XX.XXX.XXX.XX"
     }
 
     private fun renderDetailsButton(isDetailsButtonVisible: Boolean) {

vector/src/test/java/im/vector/app/test/fakes/FakePushersService.kt

@@ -20,6 +20,7 @@ import androidx.lifecycle.liveData
 import io.mockk.Ordering
 import io.mockk.coVerify
 import io.mockk.every
+import io.mockk.justRun
 import io.mockk.mockk
 import io.mockk.slot
 import io.mockk.verify
@@ -45,4 +46,12 @@ class FakePushersService : PushersService by mockk(relaxed = true) {
         verify { enqueueAddHttpPusher(capture(httpPusherSlot)) }
         return httpPusherSlot.captured
     }
+
+    fun givenRefreshPushersSucceeds() {
+        justRun { refreshPushers() }
+    }
+
+    fun verifyRefreshPushers() {
+        verify { refreshPushers() }
+    }
 }

vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt

@@ -45,7 +45,6 @@ class FakeSession(
         private val fakeEventService: FakeEventService = FakeEventService(),
         val fakeSessionAccountDataService: FakeSessionAccountDataService = FakeSessionAccountDataService(),
         val fakeFilterService: FakeFilterService = FakeFilterService(),
-        val fakePushersService: FakePushersService = FakePushersService(),
 ) : Session by mockk(relaxed = true) {
 
     init {
@@ -65,7 +64,6 @@ class FakeSession(
     override fun pushersService() = fakePushersService
     override fun accountDataService() = fakeSessionAccountDataService
     override fun filterService() = fakeFilterService
-    override fun pushersService() = fakePushersService
 
     fun givenVectorStore(vectorSessionStore: VectorSessionStore) {
         coEvery {