Swaps v1

android/app/src/main/java/io/metamask/nativeModules/RCTAnalytics.java

@@ -54,6 +54,16 @@ public void trackEvent(ReadableMap e) {
 		this.mixpanel.track(eventCategory, props);
 	}
 
+	@ReactMethod
+	public void trackEventAnonymously(ReadableMap e) {
+		String eventCategory = e.getString("category");
+		String distinctId = this.mixpanel.getDistinctId();
+		this.mixpanel.identify("0x0000000000000000");
+		JSONObject props = toJSONObject(e);
+		this.mixpanel.track(eventCategory, props);
+		this.mixpanel.identify(distinctId);
+	}
+
 	@ReactMethod
 	public void getDistinctId(Promise promise) {
 		String distinctId = this.mixpanel.getDistinctId();

app/components/Base/Keypad/components.js

@@ -17,7 +17,7 @@ const styles = StyleSheet.create({
 	},
 	keypadButton: {
 		paddingHorizontal: 20,
-		paddingVertical: Device.isMediumDevice() ? (Device.isIphone5() ? 5 : 10) : 12,
+		paddingVertical: Device.isMediumDevice() ? (Device.isIphone5() ? 4 : 8) : 12,
 		flex: 1,
 		justifyContent: 'center',
 		alignItems: 'center'

app/components/Nav/Main/index.js

@@ -269,13 +269,15 @@ const Main = props => {
 				delete newSwapsTransactions[transactionMeta.id].paramsForAnalytics;
 
 				InteractionManager.runAfterInteractions(() => {
-					Analytics.trackEventWithParameters(event, {
+					const parameters = {
 						...analyticsParams,
 						time_to_mine: timeToMine,
 						estimated_vs_used_gasRatio: estimatedVsUsedGasRatio,
 						quote_vs_executionRatio: quoteVsExecutionRatio,
-						token_to_amount_received: tokenToAmountReceived
-					});
+						token_to_amount_received: tokenToAmountReceived.toString()
+					};
+					Analytics.trackEventWithParameters(event, {});
+					Analytics.trackEventWithParameters(event, parameters, true);
 				});
 			} catch (e) {
 				Logger.error(e, ANALYTICS_EVENT_OPTS.SWAP_TRACKING_FAILED);

app/components/UI/AccountOverview/index.js

@@ -27,6 +27,7 @@ import AssetActionButton from '../AssetActionButton';
 import EthereumAddress from '../EthereumAddress';
 import { colors, fontStyles, baseStyles } from '../../../styles/common';
 import { allowedToBuy } from '../FiatOrders';
+import AssetSwapButton from '../Swaps/components/AssetSwapButton';
 
 const styles = StyleSheet.create({
 	scrollView: {
@@ -351,13 +352,11 @@ class AccountOverview extends PureComponent {
 								label={strings('asset_overview.send_button')}
 							/>
 							{AppConstants.SWAPS.ACTIVE && (
-								<AssetActionButton
-									icon="swap"
-									label={strings('asset_overview.swap')}
-									disabled={
-										!swapsIsLive || (AppConstants.SWAPS.ONLY_MAINNET ? !isMainNet(chainId) : false)
-									}
+								<AssetSwapButton
+									isFeatureLive={swapsIsLive}
+									isNetworkAllowed={AppConstants.SWAPS.ONLY_MAINNET ? isMainNet(chainId) : true}
 									onPress={this.goToSwaps}
+									isAssetAllowed
 								/>
 							)}
 						</View>

app/components/UI/AssetOverview/index.js

@@ -21,6 +21,7 @@ import Logger from '../../../util/Logger';
 import Analytics from '../../../core/Analytics';
 import { ANALYTICS_EVENT_OPTS } from '../../../util/analytics';
 import { allowedToBuy } from '../FiatOrders';
+import AssetSwapButton from '../Swaps/components/AssetSwapButton';
 
 const styles = StyleSheet.create({
 	wrapper: {
@@ -297,14 +298,10 @@ class AssetOverview extends PureComponent {
 							label={strings('asset_overview.send_button')}
 						/>
 						{AppConstants.SWAPS.ACTIVE && (
-							<AssetActionButton
-								icon="swap"
-								label={strings('asset_overview.swap')}
-								disabled={
-									!swapsIsLive ||
-									(AppConstants.SWAPS.ONLY_MAINNET ? !isMainNet(chainId) : false) ||
-									(!isETH && !(address?.toLowerCase() in swapsTokens))
-								}
+							<AssetSwapButton
+								isFeatureLive={swapsIsLive}
+								isNetworkAllowed={AppConstants.SWAPS.ONLY_MAINNET ? isMainNet(chainId) : true}
+								isAssetAllowed={isETH || address?.toLowerCase() in swapsTokens}
 								onPress={this.goToSwaps}
 							/>
 						)}

app/components/UI/CustomGas/index.js

@@ -225,6 +225,10 @@ class CustomGas extends PureComponent {
 		 * Object BN containing estimated gas limit
 		 */
 		gas: PropTypes.object,
+		/**
+		 * Gas limit estimation that should be the minimum value to set
+		 */
+		minimumGasLimit: PropTypes.string,
 		/**
 		 * Object BN containing gas price
 		 */
@@ -417,7 +421,10 @@ class CustomGas extends PureComponent {
 		else if (bnValue && !isBN(bnValue)) warningGasLimit = strings('transaction.invalid_gas');
 		else if (bnValue.lt(new BN(21000)) || bnValue.gt(new BN(7920028)))
 			warningGasLimit = strings('custom_gas.warning_gas_limit');
-
+		else if (this.props.minimumGasLimit && bnValue.lt(new BN(this.props.minimumGasLimit)))
+			warningGasLimit = strings('custom_gas.warning_gas_limit_estimated', {
+				gas: this.props.minimumGasLimit.toString(10)
+			});
 		this.setState({
 			customGasLimit: value,
 			customGasLimitBN: bnValue,
@@ -450,7 +457,7 @@ class CustomGas extends PureComponent {
 
 	//Handle gas fee selection when save button is pressed instead of everytime a change is made, otherwise cannot switch back to review mode if there is an error
 	saveCustomGasSelection = () => {
-		const { gasSpeedSelected, customGasLimit, customGasPrice } = this.state;
+		const { gasSpeedSelected, customGasLimit, customGasPriceBNWei } = this.state;
 		const {
 			review,
 			gas,
@@ -459,7 +466,7 @@ class CustomGas extends PureComponent {
 			basicGasEstimates: { fastGwei, averageGwei, safeLowGwei }
 		} = this.props;
 		if (advancedCustomGas) {
-			handleGasFeeSelection(new BN(customGasLimit), apiEstimateModifiedToWEI(customGasPrice), {
+			handleGasFeeSelection(new BN(customGasLimit), customGasPriceBNWei, {
 				mode: 'advanced'
 			});
 		} else {