Merge pull request #1355 from ethereum/meta-cleanup

Meta cleanup

Author: samajammin

.github/ISSUE_TEMPLATE/new_exchange.md renamed to .github/ISSUE_TEMPLATE/suggest_exchange.md

@@ -1,22 +1,24 @@
 ---
-name: Add an exchange
-about: Suggest a new exchange for us to list
+name: Suggest an exchange
+about: Suggest a new exchange to list on ethereum.org
 title: ""
-labels: "Type: Feature"
+labels: "Type: Feature", "Type: Content"
 assignees: ""
 ---
 
-Please fill out this short form if you'd like an exchange added to ethereum.org. If it's a decentralized exchange (DEX) you'd like to list, please take a look at our [policy for listing dapps](https://ethereum.org/en/contributing/adding-products/).
+Before suggesting an exchange, make sure you've read [our exchange listing policy](https://ethereum.org/en/contributing/adding-exchanges/). If it's a decentralized exchange (DEX) you'd like to list, please take a look at our [policy for listing dapps](https://ethereum.org/en/contributing/adding-products/).
 
-**What geographical restrictions apply to this exchange?** 
+Please fill out this short form if you'd like an exchange added to ethereum.org:
+
+**What geographical restrictions apply to this exchange?**
 
 <!-- If you don't know, please get in touch with the exchange. They'll likely have a list of restricted countries and jurisdictions. -->
 
 **Which currencies are accepted by this exchange?**
 
 <!-- If you don't know, please get in touch with the exchange. They'll likely have a list of accepted currencies -->
 
-**Do you have any proof that they're a legitimate company**
+**Do you have any proof that they're a legitimate company?**
 
 <!-- This is a safeguard against listing any malicious sites. You could provide a link to an "About" page from the exchange that provides more information about their legal entity, or a link to an official company registration -->
 

.github/ISSUE_TEMPLATE/add_wallet.md renamed to .github/ISSUE_TEMPLATE/suggest_wallet.md

@@ -1,8 +1,8 @@
 ---
 name: Suggest a wallet
-about: Suggest a new wallet to list
+about: Suggest a new wallet to list on ethereum.org
 title: ""
-labels: "Type: Feature"
+labels: "Type: Feature", "Type: Content"
 assignees: ""
 ---
 
@@ -16,7 +16,7 @@ If it does complete the following information which we need to accurately list t
 
 <!-- Does the wallet subsidise transaction fees for all or some wallet activity? -->
 
-**Does the wallet allow users to explore dapps**
+**Does the wallet allow users to explore dapps?**
 
 <!-- Is the wallet integrated with WalletConnect? Does it have a dapp browser? Or can users connect to a dapp using the wallet?  -->
 
@@ -28,7 +28,7 @@ If it does complete the following information which we need to accurately list t
 
 <!-- Can a user cash out their crypto assets directly to a card or bank account? -->
 
-**Does the wallet have limits protection?**
+**Does the wallet offer limits protection?**
 
 <!-- Can a user set a limit for transfers to protect their assets? -->
 
@@ -44,7 +44,11 @@ If it does complete the following information which we need to accurately list t
 
 <!-- Can a user opt to require multiple signatures to authorise transactions? -->
 
-**Wallet blurb**
+**Wallet title**
+
+<!-- Please provide the official name of the wallet -->
+
+**Wallet description**
 
 <!-- Please provide a short 1-2 sentence description of the wallet -->
 

src/components/WalletCompare.js

@@ -12,6 +12,7 @@ import { Content, CardContainer } from "./SharedStyledComponents"
 import Link from "./Link"
 
 import { getLocaleTimestamp } from "../utils/time"
+import { trackCustomEvent } from "../utils/matomo"
 
 const Container = styled.div`
   margin-top: 2rem;
@@ -342,6 +343,15 @@ const WalletCompare = () => {
       selectedFeatureIds.splice(index, 1)
     } else {
       selectedFeatureIds.push(featureId)
+
+      const feature = walletFeatures.filter(
+        (feature) => feature.id === featureId
+      )[0].title
+      trackCustomEvent({
+        eventCategory: `Wallet feature`,
+        eventAction: `Selected`,
+        eventName: feature,
+      })
     }
     setState({ selectedFeatureIds, wallets: state.wallets })
   }

src/pages-conditional/wallets/find-wallet.js

@@ -89,7 +89,7 @@ const FindWalletPage = ({ location, data }) => {
     <Page>
       <PageMetadata
         title="Find an Ethereum Wallet"
-        description="Find and compare wallets based on the features you want."
+        description="Find and compare Ethereum wallets based on the features you want."
       />
 
       <HeroContainer>

src/pages-conditional/wallets/index.js

@@ -364,7 +364,7 @@ const WalletsPage = ({ data }) => {
     <Page>
       <PageMetadata
         title="Ethereum wallets"
-        description="What you need to know to use Ethereum Wallets."
+        description="What you need to know to use Ethereum wallets."
         image={data.ogImage.childImageSharp.fixed.src}
       />
       <HeroContent>

src/pages/get-eth.js

@@ -234,7 +234,7 @@ const GetETHPage = ({ data }) => {
     <Page>
       <PageMetadata
         title="How to buy ETH"
-        description="How to get ETH based on where you live and advice on how to look after it"
+        description="How to buy ETH based on where you live and advice on how to look after it."
       />
 
       <HeroContainer>
@@ -281,8 +281,14 @@ const GetETHPage = ({ data }) => {
               All exchanges, wallets and DEXs listed on this page are not
               official endorsements, and are provided for informational purposes
               only. We add products to this page based on criteria in our{" "}
-              <Link to="/en/contributing/adding-products/">dapps</Link> {" "}and <Link to="/en/contributing/adding-exchanges/">exchanges</Link> {" "}listing policies.
-              If you want to add an exchange or provide feedback on the policy{" "} <Link to="https://github.com/ethereum/ethereum-org-website/issues/new/choose">raise an issue in GitHub</Link>.
+              <Link to="/en/contributing/adding-products/">dapps</Link> and{" "}
+              <Link to="/en/contributing/adding-exchanges/">exchanges</Link>{" "}
+              listing policies. If you want to add an exchange or provide
+              feedback on the policy{" "}
+              <Link to="https://github.com/ethereum/ethereum-org-website/issues/new/choose">
+                raise an issue in GitHub
+              </Link>
+              .
             </em>
           </p>
         </Content>