Fix approval transaction getting mistakenly treated as a swap transaction (#3295)

* Check MM_FOX_CODE as origin for swaps

* Add MM_FOX_CODE to .js.env.example
pull/3292/head^2
Andre Pimenta 2 years ago committed by GitHub
parent 3f9d91c60d
commit d5132835de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .android.env.example
  2. 2
      .ios.env.example
  3. 1
      .js.env.example
  4. 5
      app/components/Nav/Main/index.js
  5. 4
      ios/Podfile.lock

@ -1,4 +1,4 @@
export MM_FOX_CODE=
export MM_FOX_CODE="EXAMPLE_FOX_CODE"
export MM_BRANCH_KEY_TEST=
export MM_BRANCH_KEY_LIVE=
export MM_MIXPANEL_TOKEN=

@ -1,3 +1,3 @@
MM_FOX_CODE =
MM_FOX_CODE = EXAMPLE_FOX_CODE
MM_BRANCH_KEY_TEST =
MM_BRANCH_KEY_LIVE =

@ -11,6 +11,7 @@ export MM_PUBNUB_SUB_KEY=""
export MM_PUBNUB_PUB_KEY=""
export MM_OPENSEA_KEY=""
export MM_ETHERSCAN_KEY=""
export MM_FOX_CODE="EXAMPLE_FOX_CODE"
# NOTE: Non-Metamask only, will need to create an account and generate
# API key at https://infura.io in order to connect to main and test nets.

@ -323,6 +323,7 @@ const Main = (props) => {
// if approval data includes metaswap contract
// if destination address is metaswap contract
if (
transactionMeta.origin === process.env.MM_FOX_CODE &&
to &&
(swapsUtils.isValidContractAddress(props.chainId, to) ||
(data &&
@ -330,9 +331,7 @@ const Main = (props) => {
decodeApproveData(data).spenderAddress?.toLowerCase() ===
swapsUtils.getSwapsContractAddress(props.chainId)))
) {
if (transactionMeta.origin === process.env.MM_FOX_CODE) {
autoSign(transactionMeta);
}
autoSign(transactionMeta);
} else {
const {
transaction: { value, gas, gasPrice, data },

@ -661,7 +661,7 @@ SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
Branch: 6a281514287f99d707615ac62c2cca69e0213df0
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: cde416483dac037923206447da6e1454df403714
DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
Flipper: 1bd2db48dcc31e4b167b9a33ec1df01c2ded4893
@ -672,7 +672,7 @@ SPEC CHECKSUMS:
Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154
FlipperKit: 651f50a42eb95c01b3e89a60996dd6aded529eeb
Folly: b73c3869541e86821df3c387eb0af5f65addfab4
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
glog: 1f3da668190260b06b429bb211bfbee5cd790c28
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
lottie-ios: a50d5c0160425cd4b01b852bb9578963e6d92d31
lottie-react-native: 7ca15c46249b61e3f9ffcf114cb4123e907a2156

Loading…
Cancel
Save