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

Fix send sheet stuck on loading #6119

Merged
merged 9 commits into from
Sep 20, 2024
Merged

Fix send sheet stuck on loading #6119

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a4b2f42
fix stuck loading phase
walmat Sep 19, 2024
3fa0b3e
Update src/screens/SendSheet.js
walmat Sep 19, 2024
8cee9c6
fix deleting contact resetting toAddress to undefined
walmat Sep 19, 2024
fe9505c
fix some shit with ens names
walmat Sep 19, 2024
3f36f90
rm logs
walmat Sep 19, 2024
1ac6cb7
fix failed to send
walmat Sep 19, 2024
21a4c76
fix lint
walmat Sep 19, 2024
7adfdc8
prefer contact name over wallet label
walmat Sep 19, 2024
4b943f7
force linter 2 re-rerun
brunobar79 Sep 19, 2024
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
11 changes: 9 additions & 2 deletions src/screens/SendSheet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,14 +588,22 @@ export default function SendSheet(props) {
})();
}
},
[amountDetails.assetAmount, goBack, isENS, isHardwareWallet, navigate, onSubmit, recipient, selected?.name, selected?.network]
[amountDetails, goBack, isENS, isHardwareWallet, navigate, onSubmit, recipient, selected?.name, selected?.network]
);

const { buttonDisabled, buttonLabel } = useMemo(() => {
const isZeroAssetAmount = Number(amountDetails.assetAmount) <= 0;
let disabled = true;
let label = lang.t('button.confirm_exchange.enter_amount');

console.log({
empty: isEmpty(gasFeeParamsBySpeed),
selectedGasFee: !selectedGasFee,
gasFee: isEmpty(selectedGasFee?.gasFee),
toAddress: !toAddress,
needsL1SecurityFeeChains: needsL1SecurityFeeChains.includes(currentChainId) && l1GasFeeOptimism === null,
});

walmat marked this conversation as resolved.
Show resolved Hide resolved
if (isENS && !ensProfile.isSuccess) {
label = lang.t('button.confirm_exchange.loading');
disabled = true;
Expand Down Expand Up @@ -764,7 +772,6 @@ export default function SendSheet(props) {

if (
!!accountAddress &&
amountDetails.assetAmount !== '' &&
Object.entries(selected).length &&
assetChainId === currentChainId &&
currentProviderChainId === currentChainId &&
Expand Down
Loading