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

feat: trigger qrsigning modal using approval controller #6212

Merged
merged 11 commits into from
Jun 23, 2023
Merged

feat: trigger qrsigning modal using approval controller #6212

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5d37138
feat: trigger qrsigning modal using approval controller
OGPoyraz Apr 19, 2023
0e4f65e
fix: use approval request to control QR modal
vinistevam May 4, 2023
f2b367a
remove QRState usage
vinistevam May 11, 2023
bda93b9
use approval request to control QR modal for tx
vinistevam Jun 16, 2023
6e623f3
Merge branch 'main' into feat/783-trigger-modal-using-approval-contro…
vinistevam Jun 16, 2023
e7bacdb
fix lint
vinistevam Jun 16, 2023
24251e4
Merge branch 'main' into feat/783-trigger-modal-using-approval-contro…
vinistevam Jun 19, 2023
541f9cd
Merge branch 'main' into feat/783-trigger-modal-using-approval-contro…
vinistevam Jun 19, 2023
0f5b223
Merge branch 'main' into feat/783-trigger-modal-using-approval-contro…
vinistevam Jun 20, 2023
16eb734
add early return on qr signing modal
vinistevam Jun 23, 2023
bef3fe0
Merge branch 'main' into feat/783-trigger-modal-using-approval-contro…
vinistevam Jun 23, 2023
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
19 changes: 13 additions & 6 deletions app/components/Nav/Main/RootRPCMethodsUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,12 +380,16 @@ const RootRPCMethodsUI = (props) => {

const renderQRSigningModal = () => {
const { isSigningQRObject, QRState } = props;
const shouldRenderThisModal = !showPendingApproval && isSigningQRObject;
return (
shouldRenderThisModal && (
<QRSigningModal isVisible={isSigningQRObject} QRState={QRState} />
)
);

if (
!isSigningQRObject ||
transactionModalType ||
showPendingApproval?.type !== ApprovalTypes.TRANSACTION
) {
return null;
}

return <QRSigningModal isVisible QRState={QRState} />;
};

const onWalletConnectSessionApproval = () => {
Expand Down Expand Up @@ -439,6 +443,7 @@ const RootRPCMethodsUI = (props) => {

const hideTransactionModal = () => {
setShowPendingApproval(false);
setTransactionModalType(undefined);
matthewwalsh0 marked this conversation as resolved.
Show resolved Hide resolved
};

const showTransactionApproval = () =>
Expand Down Expand Up @@ -830,7 +835,9 @@ RootRPCMethodsUI.propTypes = {
* Chain id
*/
chainId: PropTypes.string,
// eslint-disable-next-line react/no-unused-prop-types
isSigningQRObject: PropTypes.bool,
// eslint-disable-next-line react/no-unused-prop-types
QRState: PropTypes.object,
/**
* updates redux when network is switched
Expand Down