Skip to content

Commit 1cc7f84

Browse files
committed
Update onboarding view when creating first account
1 parent e448e4e commit 1cc7f84

File tree

7 files changed

+6
-219
lines changed

7 files changed

+6
-219
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -270,11 +270,6 @@
270270
android:launchMode="singleTop"
271271
android:parentActivityName=".ui.account.newaccountidentity.NewAccountIdentityActivity"
272272
android:screenOrientation="portrait" />
273-
<activity
274-
android:name=".ui.account.newaccountconfirmed.NewAccountConfirmedActivity"
275-
android:launchMode="singleTop"
276-
android:parentActivityName=".ui.account.newaccountsetup.NewAccountSetupActivity"
277-
android:screenOrientation="portrait" />
278273
<activity
279274
android:name=".ui.account.accountdetails.AccountReleaseScheduleActivity"
280275
android:launchMode="singleTop"

app/src/main/java/com/concordium/wallet/ui/account/accountdetails/AccountDetailsFragment.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,6 @@ class AccountDetailsFragment : BaseFragment(), EarnDelegate by EarnDelegateImpl(
208208
}
209209
}
210210

211-
viewModelAccountDetails.newFinalizedAccountFlow.collectWhenStarted(viewLifecycleOwner) {
212-
if (it.isNotEmpty()) {
213-
updateViews(viewModelAccountDetails.activeAccount.first())
214-
viewModelTokens.loadTokens(viewModelAccountDetails.activeAccount.first().address)
215-
}
216-
}
217-
218211
viewModelAccountDetails.fileWalletMigrationVisible.collectWhenStarted(viewLifecycleOwner) {
219212
binding.fileWalletMigrationDisclaimerLayout.isVisible = it
220213
isFileWallet = it

app/src/main/java/com/concordium/wallet/ui/account/accountdetails/AccountDetailsViewModel.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -191,15 +191,7 @@ class AccountDetailsViewModel(application: Application) : AndroidViewModel(appli
191191
}
192192
}
193193

194-
override fun onNewAccountFinalized(accountName: String) {
195-
viewModelScope.launch {
196-
getActiveAccount()
197-
updateAccountFromRepository()
198-
postState(OnboardingState.DONE)
199-
restartUpdater(BuildConfig.ACCOUNT_UPDATE_FREQUENCY_SEC)
200-
_newFinalizedAccountFlow.value = accountName
201-
}
202-
}
194+
override fun onNewAccountFinalized(accountName: String) { }
203195

204196
override fun onError(stringRes: Int) {
205197
_errorLiveData.value = Event(stringRes)

app/src/main/java/com/concordium/wallet/ui/account/newaccountconfirmed/NewAccountConfirmedActivity.kt

Lines changed: 0 additions & 102 deletions
This file was deleted.

app/src/main/java/com/concordium/wallet/ui/account/newaccountconfirmed/NewAccountConfirmedViewModel.kt

Lines changed: 0 additions & 38 deletions
This file was deleted.

app/src/main/java/com/concordium/wallet/ui/account/newaccountsetup/NewAccountSetupActivity.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.concordium.wallet.core.backend.BackendError
1111
import com.concordium.wallet.data.room.Account
1212
import com.concordium.wallet.data.room.Identity
1313
import com.concordium.wallet.databinding.ActivityNewAccountSetupBinding
14-
import com.concordium.wallet.ui.account.newaccountconfirmed.NewAccountConfirmedActivity
14+
import com.concordium.wallet.ui.MainActivity
1515
import com.concordium.wallet.ui.base.BaseActivity
1616
import com.concordium.wallet.ui.common.delegates.AuthDelegate
1717
import com.concordium.wallet.ui.common.delegates.AuthDelegateImpl
@@ -86,7 +86,7 @@ class NewAccountSetupActivity : BaseActivity(
8686
})
8787
viewModel.gotoAccountCreatedLiveData.observe(this, object : EventObserver<Account>() {
8888
override fun onUnhandledEvent(value: Account) {
89-
gotoNewAccountConfirmed(value)
89+
gotoNewAccountConfirmed()
9090
}
9191
})
9292
viewModel.gotoFailedLiveData.observe(
@@ -126,9 +126,9 @@ class NewAccountSetupActivity : BaseActivity(
126126
}
127127
}
128128

129-
private fun gotoNewAccountConfirmed(account: Account) {
130-
val intent = Intent(this, NewAccountConfirmedActivity::class.java)
131-
intent.putExtra(NewAccountConfirmedActivity.EXTRA_ACCOUNT, account)
129+
private fun gotoNewAccountConfirmed() {
130+
val intent = Intent(this, MainActivity::class.java)
131+
intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
132132
startActivity(intent)
133133
}
134134

app/src/main/res/layout/activity_new_account_confirmed.xml

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)