From 3df241f7204763c36ec1c8da14935f2ebcc360d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Rodriguez=20Ve=CC=81lez?= Date: Sat, 24 Sep 2022 14:14:01 -0400 Subject: [PATCH] FIX: Ability to send "MAX" is disabled after scanning QR code #4985 --- ios/Podfile.lock | 4 ++-- package-lock.json | 26 +++++++++++++++++++++----- package.json | 2 +- screen/send/details.js | 4 ++-- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index ce119499b..fc8eb7d8b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -300,7 +300,7 @@ PODS: - React-Core - react-native-image-picker (4.8.5): - React-Core - - react-native-ios-context-menu (1.7.4): + - react-native-ios-context-menu (1.12.2): - React-Core - react-native-randombytes (3.6.1): - React-Core @@ -772,7 +772,7 @@ SPEC CHECKSUMS: react-native-fingerprint-scanner: ac6656f18c8e45a7459302b84da41a44ad96dbbe react-native-idle-timer: f7f651542b39dce9b9473e4578cb64a255075f17 react-native-image-picker: cd420f97f6ed6ff74fc4686d27dbcfdbd051db91 - react-native-ios-context-menu: 7bf49ec6006cc0c61d873419557b85eb1b9629fb + react-native-ios-context-menu: 46b2b5e5b1467564cb7f7729e78adbd0738620a0 react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846 react-native-safe-area-context: 9e40fb181dac02619414ba1294d6c2a807056ab9 react-native-tcp-socket: c1b7297619616b4c9caae6889bcb0aba78086989 diff --git a/package-lock.json b/package-lock.json index b10a5b17c..45c1d9619 100644 --- a/package-lock.json +++ b/package-lock.json @@ -71,7 +71,7 @@ "react-native-haptic-feedback": "1.14.0", "react-native-idle-timer": "https://github.com/BlueWallet/react-native-idle-timer#8587876d68ab5920e79619726aeca9e672beaf2b", "react-native-image-picker": "4.8.5", - "react-native-ios-context-menu": "https://github.com/BlueWallet/react-native-ios-context-menu.git#v1.7.4", + "react-native-ios-context-menu": "github:BlueWallet/react-native-ios-context-menu#v1.12.2", "react-native-keychain": "8.0.0", "react-native-level-fs": "3.0.1", "react-native-linear-gradient": "2.6.2", @@ -2216,6 +2216,11 @@ "node": ">=0.1.95" } }, + "node_modules/@dominicstop/ts-event-emitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@dominicstop/ts-event-emitter/-/ts-event-emitter-1.1.0.tgz", + "integrity": "sha512-CcxmJIvUb1vsFheuGGVSQf4KdPZC44XolpUT34+vlal+LyQoBUOn31pjFET5M9ctOxEpt8xa0M3/2M7uUiAoJw==" + }, "node_modules/@egjs/hammerjs": { "version": "2.0.17", "resolved": "https://registry.npmjs.org/@egjs/hammerjs/-/hammerjs-2.0.17.tgz", @@ -22377,9 +22382,12 @@ } }, "node_modules/react-native-ios-context-menu": { - "version": "1.7.4", - "resolved": "git+ssh://git@github.com/BlueWallet/react-native-ios-context-menu.git#559b4e40dd38bf19ecf735e4ce710f9d754b6bc9", + "version": "1.12.2", + "resolved": "git+ssh://git@github.com/BlueWallet/react-native-ios-context-menu.git#baa137f0187c39158ac4c2f783f60a0687e41de3", "license": "MIT", + "dependencies": { + "@dominicstop/ts-event-emitter": "^1.1.0" + }, "peerDependencies": { "react": "*", "react-native": "*" @@ -30086,6 +30094,11 @@ "minimist": "^1.2.0" } }, + "@dominicstop/ts-event-emitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@dominicstop/ts-event-emitter/-/ts-event-emitter-1.1.0.tgz", + "integrity": "sha512-CcxmJIvUb1vsFheuGGVSQf4KdPZC44XolpUT34+vlal+LyQoBUOn31pjFET5M9ctOxEpt8xa0M3/2M7uUiAoJw==" + }, "@egjs/hammerjs": { "version": "2.0.17", "resolved": "https://registry.npmjs.org/@egjs/hammerjs/-/hammerjs-2.0.17.tgz", @@ -45464,8 +45477,11 @@ "integrity": "sha512-+pQxkjO8cKv4RKTHOFS0fSHQ11HkWgb+imUPSOS8mwoChkR33aSuzV/6P4t9JCJgsus4qLAlB6BUosdIxw7GTA==" }, "react-native-ios-context-menu": { - "version": "git+ssh://git@github.com/BlueWallet/react-native-ios-context-menu.git#559b4e40dd38bf19ecf735e4ce710f9d754b6bc9", - "from": "react-native-ios-context-menu@https://github.com/BlueWallet/react-native-ios-context-menu.git#v1.7.4" + "version": "git+ssh://git@github.com/BlueWallet/react-native-ios-context-menu.git#baa137f0187c39158ac4c2f783f60a0687e41de3", + "from": "react-native-ios-context-menu@https://github.com/BlueWallet/react-native-ios-context-menu.git#v1.12.2", + "requires": { + "@dominicstop/ts-event-emitter": "^1.1.0" + } }, "react-native-iphone-x-helper": { "version": "1.3.1", diff --git a/package.json b/package.json index 2312fee25..3122e8a64 100644 --- a/package.json +++ b/package.json @@ -157,7 +157,7 @@ "react-native-haptic-feedback": "1.14.0", "react-native-idle-timer": "https://github.com/BlueWallet/react-native-idle-timer#8587876d68ab5920e79619726aeca9e672beaf2b", "react-native-image-picker": "4.8.5", - "react-native-ios-context-menu": "https://github.com/BlueWallet/react-native-ios-context-menu.git#v1.7.4", + "react-native-ios-context-menu": "github:BlueWallet/react-native-ios-context-menu#v1.12.2", "react-native-keychain": "8.0.0", "react-native-level-fs": "3.0.1", "react-native-linear-gradient": "2.6.2", diff --git a/screen/send/details.js b/screen/send/details.js index afa0ddc3e..23931294b 100644 --- a/screen/send/details.js +++ b/screen/send/details.js @@ -1,4 +1,4 @@ -import React, { useState, useRef, useEffect, useCallback, useContext, useMemo } from 'react'; +import React, { useState, useRef, useEffect, useCallback, useContext, useMemo, useLayoutEffect } from 'react'; import { ActivityIndicator, Alert, @@ -99,7 +99,7 @@ const SendDetails = () => { return initialFee; }, [customFee, feePrecalc, networkTransactionFees]); - useEffect(() => { + useLayoutEffect(() => { if (wallet) { setHeaderRightOptions(); }