Skip to content

Commit

Permalink
[FIX] Jazz icons constantly changing (MetaMask#4503)
Browse files Browse the repository at this point in the history 
* jazz icons are not changing anymore

* AddressTo fix prop name

* variable refactor

Co-authored-by: André Fatia <[email protected]>
Co-authored-by: Curtis David <[email protected]>
  • Loading branch information
@tommasini @Fatxx @cortisiko
3 people authored Aug 12, 2022
1 parent a92a049 commit f33cace
Showing 1 changed file with 40 additions and 44 deletions.
84 changes: 40 additions & 44 deletions app/components/Views/SendFlow/SendTo/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ class SendFlow extends PureComponent {
fromSelectedAddress: this.props.selectedAddress,
fromAccountName: this.props.identities[this.props.selectedAddress].name,
fromAccountBalance: undefined,
toSelectedAddress: undefined,
toAccount: undefined,
toSelectedAddressName: undefined,
toSelectedAddressReady: false,
toEnsName: undefined,
Expand Down Expand Up @@ -365,16 +365,16 @@ class SendFlow extends PureComponent {
};
/**
* This returns the address name from the address book or user accounts if the selectedAddress exist there
* @param {String} toSelectedAddress - Address input
* @returns {String | null} - Address or null if toSelectedAddress is not in the addressBook or identities array
* @param {String} toAccount - Address input
* @returns {String | null} - Address or null if toAccount is not in the addressBook or identities array
*/
getAddressNameFromBookOrIdentities = (toSelectedAddress) => {
if (!toSelectedAddress) return;
getAddressNameFromBookOrIdentities = (toAccount) => {
if (!toAccount) return;

const { addressBook, network, identities } = this.props;
const networkAddressBook = addressBook[network] || {};

const checksummedAddress = toChecksumAddress(toSelectedAddress);
const checksummedAddress = toChecksumAddress(toAccount);

return networkAddressBook[checksummedAddress]
? networkAddressBook[checksummedAddress].name
Expand All @@ -384,16 +384,16 @@ class SendFlow extends PureComponent {
};

isAddressSaved = () => {
const { toSelectedAddress } = this.state;
const { toAccount } = this.state;
const { addressBook, network, identities } = this.props;
const networkAddressBook = addressBook[network] || {};
const checksummedAddress = toChecksumAddress(toSelectedAddress);
const checksummedAddress = toChecksumAddress(toAccount);
return !!(
networkAddressBook[checksummedAddress] || identities[checksummedAddress]
);
};

validateAddressOrENSFromInput = async (toSelectedAddress) => {
validateAddressOrENSFromInput = async (toAccount) => {
const { AssetsContractController } = Engine.context;
const { addressBook, network, identities, providerType } = this.props;
const networkAddressBook = addressBook[network] || {};
Expand All @@ -405,8 +405,8 @@ class SendFlow extends PureComponent {
confusableCollection,
toEnsAddressResolved;
let [addToAddressToAddressBook, toSelectedAddressReady] = [false, false];
if (isValidHexAddress(toSelectedAddress, { mixedCaseUseChecksum: true })) {
const checksummedAddress = toChecksumAddress(toSelectedAddress);
if (isValidHexAddress(toAccount, { mixedCaseUseChecksum: true })) {
const checksummedAddress = toChecksumAddress(toAccount);
toSelectedAddressReady = true;
const ens = await doENSReverseLookup(checksummedAddress);
if (ens) {
Expand All @@ -421,7 +421,7 @@ class SendFlow extends PureComponent {
!networkAddressBook[checksummedAddress] &&
!identities[checksummedAddress]
) {
toAddressName = toSelectedAddress;
toAddressName = toAccount;
// If not in the addressBook nor user accounts
addToAddressToAddressBook = true;
}
Expand Down Expand Up @@ -455,7 +455,7 @@ class SendFlow extends PureComponent {
}

/**
* Not using this for now; Import isSmartContractAddress from utils/transaction and use this for checking smart contract: await isSmartContractAddress(toSelectedAddress);
* Not using this for now; Import isSmartContractAddress from utils/transaction and use this for checking smart contract: await isSmartContractAddress(toEnsAddressResolved || toAccount);
* Check if it's smart contract address
*/
/*
Expand All @@ -466,13 +466,13 @@ class SendFlow extends PureComponent {
isOnlyWarning = true;
}
*/
} else if (isENS(toSelectedAddress)) {
toEnsName = toSelectedAddress;
} else if (isENS(toAccount)) {
toEnsName = toAccount;
confusableCollection = collectConfusables(toEnsName);
const resolvedAddress = await doENSLookup(toSelectedAddress, network);
const resolvedAddress = await doENSLookup(toAccount, network);
if (resolvedAddress) {
const checksummedAddress = toChecksumAddress(resolvedAddress);
toAddressName = toSelectedAddress;
toAddressName = toAccount;
toEnsAddressResolved = resolvedAddress;
toSelectedAddressReady = true;
if (
Expand All @@ -484,7 +484,7 @@ class SendFlow extends PureComponent {
} else {
addressError = strings('transaction.could_not_resolve_ens');
}
} else if (toSelectedAddress && toSelectedAddress.length >= 42) {
} else if (toAccount && toAccount.length >= 42) {
addressError = strings('transaction.invalid_address');
}

Expand All @@ -501,46 +501,43 @@ class SendFlow extends PureComponent {
});
};

onToSelectedAddressChange = (toSelectedAddress) => {
const addressName =
this.getAddressNameFromBookOrIdentities(toSelectedAddress);
onToSelectedAddressChange = (toAccount) => {
const addressName = this.getAddressNameFromBookOrIdentities(toAccount);

/**
* If the address is from addressBook or identities
* then validation is not necessary since it was already validated
*/
if (addressName) {
this.setState({
toSelectedAddress,
toAccount,
toSelectedAddressReady: true,
isFromAddressBook: true,
toSelectedAddressName: addressName,
});
} else {
this.validateAddressOrENSFromInput(toSelectedAddress);
this.validateAddressOrENSFromInput(toAccount);
/**
* Because validateAddressOrENSFromInput is an asynchronous function
* we are setting the state here synchronously, so it does not block the UI
* */
this.setState({
toSelectedAddress,
toAccount,
isFromAddressBook: false,
});
}
};

validateToAddress = async () => {
const { toSelectedAddress } = this.state;
const { toAccount } = this.state;
const { network } = this.props;
let addressError;
if (isENS(toSelectedAddress)) {
const resolvedAddress = await doENSLookup(toSelectedAddress, network);
if (isENS(toAccount)) {
const resolvedAddress = await doENSLookup(toAccount, network);
if (!resolvedAddress) {
addressError = strings('transaction.could_not_resolve_ens');
}
} else if (
!isValidHexAddress(toSelectedAddress, { mixedCaseUseChecksum: true })
) {
} else if (!isValidHexAddress(toAccount, { mixedCaseUseChecksum: true })) {
addressError = strings('transaction.invalid_address');
}
this.setState({ addressError });
Expand All @@ -557,9 +554,9 @@ class SendFlow extends PureComponent {

onSaveToAddressBook = () => {
const { network } = this.props;
const { toSelectedAddress, alias, toEnsAddressResolved } = this.state;
const { toAccount, alias, toEnsAddressResolved } = this.state;
const { AddressBookController } = Engine.context;
const toAddress = toEnsAddressResolved || toSelectedAddress;
const toAddress = toEnsAddressResolved || toAccount;
AddressBookController.set(toAddress, alias, network);
this.toggleAddToAddressBookModal();

Expand All @@ -568,7 +565,7 @@ class SendFlow extends PureComponent {
addToAddressToAddressBook: false,
alias: undefined,
isFromAddressBook: true,
toSelectedAddress: toAddress,
toAccount: toAddress,
});
};

Expand All @@ -586,7 +583,7 @@ class SendFlow extends PureComponent {
const { setRecipient, navigation, providerType, addRecent } = this.props;
const {
fromSelectedAddress,
toSelectedAddress,
toAccount,
toEnsName,
toSelectedAddressName,
fromAccountName,
Expand All @@ -596,7 +593,7 @@ class SendFlow extends PureComponent {
const addressError = await this.validateToAddress();
if (addressError) return;
}
const toAddress = toEnsAddressResolved || toSelectedAddress;
const toAddress = toEnsAddressResolved || toAccount;
addRecent(toAddress);
setRecipient(
fromSelectedAddress,
Expand Down Expand Up @@ -742,13 +739,12 @@ class SendFlow extends PureComponent {
};

render = () => {
const { ticker } = this.props;
const { addressBook, network } = this.props;
const { ticker, addressBook, network } = this.props;
const {
fromSelectedAddress,
fromAccountName,
fromAccountBalance,
toSelectedAddress,
toAccount,
toSelectedAddressReady,
toSelectedAddressName,
addToAddressToAddressBook,
Expand All @@ -760,12 +756,12 @@ class SendFlow extends PureComponent {
isOnlyWarning,
confusableCollection,
isFromAddressBook,
toEnsAddressResolved,
} = this.state;
const colors = this.context.colors || mockTheme.colors;
const styles = createStyles(colors);

const checksummedAddress =
toSelectedAddress && toChecksumAddress(toSelectedAddress);
const checksummedAddress = toAccount && toChecksumAddress(toAccount);
const existingContact =
checksummedAddress &&
addressBook[network] &&
Expand Down Expand Up @@ -797,7 +793,7 @@ class SendFlow extends PureComponent {
inputRef={this.addressToInputRef}
highlighted={toInputHighlighted}
addressToReady={toSelectedAddressReady}
toSelectedAddress={toSelectedAddress}
toSelectedAddress={toEnsAddressResolved || toAccount}
toAddressName={toSelectedAddressName}
onToSelectedAddressChange={this.onToSelectedAddressChange}
onScan={this.onScan}
Expand All @@ -813,11 +809,11 @@ class SendFlow extends PureComponent {
/>
</View>

{!toSelectedAddressReady && !!toSelectedAddress && (
{!toSelectedAddressReady && !!toAccount && (
<View style={styles.warningContainer}>
<WarningMessage
warningMessage={
toSelectedAddress.substring(0, 2) === '0x'
toAccount.substring(0, 2) === '0x'
? strings('transaction.address_invalid')
: strings('transaction.ens_not_found')
}
Expand All @@ -827,7 +823,7 @@ class SendFlow extends PureComponent {

{!toSelectedAddressReady ? (
<AddressList
inputSearch={toSelectedAddress}
inputSearch={toAccount}
onAccountPress={this.onToSelectedAddressChange}
onAccountLongPress={dummy}
/>
Expand Down

0 comments on commit f33cace

Please sign in to comment.