Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed account switch transition #13968

Merged
merged 1 commit into from
Jun 28, 2022
Merged

Fixed account switch transition #13968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion android/java/org/chromium/chrome/browser/crypto_wallet/adapters/WalletCoinAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ public void onCheckedChanged(
}
} else if (mType == AdapterType.ACCOUNTS_LIST
|| mType == AdapterType.SELECT_ACCOUNTS_LIST) {
holder.iconImg.setImageResource(android.R.color.transparent);
Utils.setBlockiesBitmapResource(
mExecutor, mHandler, holder.iconImg, walletListItemModel.getSubTitle(), true);
holder.itemView.setOnLongClickListener(v -> {
Expand All @@ -205,7 +206,7 @@ public void onCheckedChanged(
});
if (mType == AdapterType.SELECT_ACCOUNTS_LIST) {
holder.ivSelected.setVisibility(
walletListItemModel.getIsUserSelected() ? View.VISIBLE : View.GONE);
walletListItemModel.getIsUserSelected() ? View.VISIBLE : View.INVISIBLE);
}
}
}
Expand Down
23 changes: 11 additions & 12 deletions ...java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/EncryptionKeyFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,18 +125,17 @@ private void initState() {

if (mActivityType
== BraveWalletDAppsActivity.ActivityType.GET_ENCRYPTION_PUBLIC_KEY_REQUEST) {
mWalletModel.getCryptoModel().getPublicEncryptionRequest(
encryptionPublicKeyRequest -> {
if (encryptionPublicKeyRequest != null) {
mEncryptionPublicKeyRequest = encryptionPublicKeyRequest;
String formattedeTLD = String.format(
getString(
R.string.brave_wallet_provide_encryption_key_description),
Utils.geteTLDHTMLFormatted(
encryptionPublicKeyRequest.originInfo.eTldPlusOne));
mTvMessageDesc.setText(AndroidUtils.formateHTML(formattedeTLD));
}
});
mWalletModel.getCryptoModel().getPublicEncryptionRequest(encryptionPublicKeyRequest
-> {
if (encryptionPublicKeyRequest != null) {
mEncryptionPublicKeyRequest = encryptionPublicKeyRequest;
String formattedeTLD = String.format(
getString(R.string.brave_wallet_provide_encryption_key_description),
Utils.geteTLDHTMLFormatted(
encryptionPublicKeyRequest.originInfo.eTldPlusOne));
mTvMessageDesc.setText(AndroidUtils.formateHTML(formattedeTLD));
}
});
} else if (mActivityType == BraveWalletDAppsActivity.ActivityType.DECRYPT_REQUEST) {
mWalletModel.getCryptoModel().getDecryptMessageRequest(decryptRequest -> {
mDecryptRequest = decryptRequest;
Expand Down
2 changes: 2 additions & 0 deletions android/java/res/layout/wallet_coin_list_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="50dp"
android:minWidth="50dp"
android:layout_gravity="center_vertical"
android:contentDescription="@null"/>

Expand Down