Skip to content

Commit 76f58af

Browse files
committed
Merge remote-tracking branch 'origin/develop' into feat/on-chain-messaging
* origin/develop: fix(airdrop): receiveFromPrimary after receiving first airdrop to allow gives after
2 parents 3aae019 + b7e1802 commit 76f58af

2 files changed

Lines changed: 1 addition & 6 deletions

File tree

api/src/main/java/com/getcode/network/repository/TransactionRepository.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,14 @@ import com.getcode.solana.organizer.AccountType
3030
import com.getcode.solana.organizer.GiftCardAccount
3131
import com.getcode.solana.organizer.Organizer
3232
import com.getcode.utils.ErrorUtils
33-
import com.google.protobuf.ByteString
3433
import com.google.protobuf.Timestamp
3534
import dagger.hilt.android.qualifiers.ApplicationContext
3635
import io.grpc.stub.StreamObserver
3736
import io.reactivex.rxjava3.core.Flowable
3837
import io.reactivex.rxjava3.core.Single
39-
import io.reactivex.rxjava3.schedulers.Schedulers
4038
import io.reactivex.rxjava3.subjects.SingleSubject
4139
import kotlinx.coroutines.CoroutineScope
4240
import kotlinx.coroutines.Dispatchers
43-
import kotlinx.coroutines.flow.MutableStateFlow
44-
import kotlinx.coroutines.flow.StateFlow
45-
import kotlinx.coroutines.flow.asStateFlow
4641
import kotlinx.coroutines.flow.first
4742
import kotlinx.coroutines.flow.firstOrNull
4843
import kotlinx.coroutines.flow.flowOn

app/src/main/java/com/getcode/view/main/getKin/GetKinSheetViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ class GetKinSheetViewModel @Inject constructor(
129129
} ?: Completable.complete()
130130

131131
receiveWithinLimits.toFlowable<Any>().asFlow()
132-
}.onEach { historyController.fetchChats() }
132+
}
133133
.launchIn(viewModelScope)
134134

135135
eventFlow

0 commit comments

Comments
 (0)