Fix activeTabUrl (#2005)

* Fix transaction header title * Get activeTabUrl from props now * Update tests * Update CHANGELOG * bump * fixwcicon Co-authored-by: Esteban Mino <efmino@uc.cl>
MetaMask · Nov 19, 2020 · b37ff20 · b37ff20
1 parent b31949c
commit b37ff20
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Current Develop Branch
 
 ## v1.0.7 - Nov 17 2020
+- [#2005](https://github.com/MetaMask/metamask-mobile/pull/2005): Fix activeTabUrl (#2005)
 - [#2003](https://github.com/MetaMask/metamask-mobile/pull/2003): Bugfix/android choose password (#2003)
 - [#1992](https://github.com/MetaMask/metamask-mobile/pull/1992): Android api level (#1992)
 - [#1993](https://github.com/MetaMask/metamask-mobile/pull/1993): Catch SVG Errors (#1993)

diff --git a/app/components/UI/ApproveTransactionReview/__snapshots__/index.test.js.snap b/app/components/UI/ApproveTransactionReview/__snapshots__/index.test.js.snap
@@ -10,7 +10,7 @@ exports[`ApproveTransactionModal should render correctly 1`] = `
     }
   }
   accountsLength={1}
-  activeTabUrl=""
+  activeTabUrl="https://metamask.github.io/test-dapp/"
   conversionRate={5}
   primaryCurrency="fiat"
   providerType="ETH"

diff --git a/app/components/UI/ApproveTransactionReview/index.js b/app/components/UI/ApproveTransactionReview/index.js
@@ -257,7 +257,14 @@ class ApproveTransactionReview extends PureComponent {
 		 * Error coming from gas component
 		 */
 		gasError: PropTypes.string,
-		primaryCurrency: PropTypes.string
+		/**
+		 * Primary currency, either ETH or Fiat
+		 */
+		primaryCurrency: PropTypes.string,
+		/**
+		 * Active tab URL, the currently active tab url
+		 */
+		activeTabUrl: PropTypes.string
 	};
 
 	state = {
@@ -534,7 +541,6 @@ class ApproveTransactionReview extends PureComponent {
 
 	render = () => {
 		const {
-			activeTabUrl,
 			host,
 			tokenSymbol,
 			viewDetails,
@@ -549,6 +555,7 @@ class ApproveTransactionReview extends PureComponent {
 			primaryCurrency,
 			currentCurrency,
 			gasError,
+			activeTabUrl,
 			transaction: { origin }
 		} = this.props;
 

diff --git a/app/components/UI/ApproveTransactionReview/index.test.js b/app/components/UI/ApproveTransactionReview/index.test.js
@@ -30,6 +30,10 @@ describe('ApproveTransactionModal', () => {
 			transaction: {},
 			settings: {
 				primaryCurrency: 'fiat'
+			},
+			browser: {
+				activeTab: 1605778647042,
+				tabs: [{ id: 1605778647042, url: 'https://metamask.github.io/test-dapp/' }]
 			}
 		};
 		const wrapper = shallow(<ApproveTransactionModal />, {

diff --git a/app/components/UI/TransactionHeader/index.js b/app/components/UI/TransactionHeader/index.js
@@ -112,7 +112,8 @@ const TransactionHeader = props => {
 	};
 
 	const renderTopIcon = () => {
-		const { url, currentEnsName, icon, origin } = props.currentPageInformation;
+		const { currentEnsName, icon, origin } = props.currentPageInformation;
+		let url = props.currentPageInformation.url;
 		if (originIsDeeplink) {
 			return (
 				<View style={styles.deeplinkIconContainer}>
@@ -126,7 +127,10 @@ const TransactionHeader = props => {
 			);
 		}
 		let iconTitle = getHost(currentEnsName || url);
-		if (originIsWalletConnect) iconTitle = getHost(origin.split(WALLET_CONNECT_ORIGIN)[1]);
+		if (originIsWalletConnect) {
+			url = origin.split(WALLET_CONNECT_ORIGIN)[1];
+			iconTitle = getHost(url);
+		}
 		return (
 			<WebsiteIcon
 				style={styles.domainLogo}
@@ -143,7 +147,7 @@ const TransactionHeader = props => {
 		let title = '';
 		if (originIsDeeplink) title = renderShortAddress(spenderAddress);
 		else if (originIsWalletConnect) title = getHost(origin.split(WALLET_CONNECT_ORIGIN)[1]);
-		else title = getHost(currentEnsName || url);
+		else title = getHost(currentEnsName || url || origin);
 
 		return <Text style={styles.domainUrl}>{title}</Text>;
 	};

diff --git a/app/util/transactions.js b/app/util/transactions.js
@@ -414,10 +414,5 @@ export function getNormalizedTxState(state) {
 	return { ...state.transaction, ...state.transaction.transaction };
 }
 
-export function getActiveTabUrl({ browser = {} }) {
-	let tab;
-	if (browser.tabs && browser.activeTab) {
-		tab = browser.tabs.find(({ id }) => id === browser.activeTab);
-	}
-	return tab ? tab.url : '';
-}
+export const getActiveTabUrl = ({ browser = {} }) =>
+	browser.tabs && browser.activeTab && browser.tabs.find(({ id }) => id === browser.activeTab)?.url;
diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj
@@ -847,7 +847,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 550;
+				CURRENT_PROJECT_VERSION = 551;
 				DEAD_CODE_STRIPPING = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -910,7 +910,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 550;
+				CURRENT_PROJECT_VERSION = 551;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48XVW22RCG;
 				FRAMEWORK_SEARCH_PATHS = (