Merge pull request #1425 from CityOfZion/feature/fixes-donation-routing

Feature/fixes donation routing
CityOfZion · Sep 22, 2018 · 60d84dd · 60d84dd
2 parents 2511bde + da2aa8c
commit 60d84dd
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/app/components/Send/SendPanel/ZeroAssets/index.jsx b/app/components/Send/SendPanel/ZeroAssets/index.jsx
@@ -1,7 +1,7 @@
 // @flow
 
 import React from 'react'
-import { NavLink } from 'react-router-dom'
+import { Link } from 'react-router-dom'
 
 import { ROUTES } from '../../../../core/constants'
 import TextInput from '../../../Inputs/TextInput'
@@ -15,9 +15,9 @@ const ZeroAssets = ({ address }: { address: string }) => (
       <p>
         You’ll need to <b>transfer compatible NEP-5 assets</b> to this wallet
         using{' '}
-        <NavLink id="wallet-manager" exact to={ROUTES.RECEIVE}>
+        <Link id="receive-link" to={ROUTES.RECEIVE}>
           <span> Receive </span>
-        </NavLink>{' '}
+        </Link>{' '}
         or your public address:
       </p>
       <div className={styles.address}>

diff --git a/app/containers/Send/Send.jsx b/app/containers/Send/Send.jsx
@@ -27,7 +27,7 @@ type Props = {
   currencyCode: string,
   address: string,
   shouldRenderHeaderBar: boolean,
-  match: Object
+  location: Object
 }
 
 type State = {
@@ -67,8 +67,8 @@ export default class Send extends React.Component<Props, State> {
 
       return { sendRowDetails: newState }
     })
-    if (this.props.match) {
-      const { address } = this.props.match.params
+    if (this.props.location && this.props.location.state) {
+      const { address } = this.props.location.state
       if (address) {
         this.updateRowField(0, 'address', address)
       }

diff --git a/app/containers/Settings/Settings.jsx b/app/containers/Settings/Settings.jsx
@@ -16,7 +16,9 @@ import {
   EXPLORERS,
   CURRENCIES,
   ROUTES,
-  MODAL_TYPES
+  MODAL_TYPES,
+  COZ_DONATIONS_ADDRESS,
+  DISCORD_INVITE_LINK
 } from '../../core/constants'
 import themes from '../../themes'
 import styles from './Settings.scss'
@@ -42,9 +44,6 @@ type State = {
   explorer: string
 }
 
-const discordInviteLink = 'https://discordapp.com/invite/R8v48YA'
-const CozKey = 'Adr3XjZ5QDzVJrWvzmsTTchpLRRGSzgS5A'
-
 export default class Settings extends Component<Props, State> {
   saveWalletRecovery = () => {
     const { showSuccessNotification, showErrorNotification } = this.props
@@ -243,8 +242,14 @@ export default class Settings extends Component<Props, State> {
   }
 
   renderDontions = () => (
-    <Link to={`/send/${CozKey}`} className={styles.settingsDonations}>
-      Created by CoZ. Donations: {CozKey}
+    <Link
+      to={{
+        pathname: ROUTES.SEND,
+        state: { address: COZ_DONATIONS_ADDRESS }
+      }}
+      className={styles.settingsDonations}
+    >
+      Created by CoZ. Donations: {COZ_DONATIONS_ADDRESS}
     </Link>
   )
 
@@ -255,7 +260,7 @@ export default class Settings extends Component<Props, State> {
     </Tooltip>
   )
 
-  openDiscordLink = () => shell.openExternal(discordInviteLink)
+  openDiscordLink = () => shell.openExternal(DISCORD_INVITE_LINK)
 
   renderHeader = () => (
     <div className={styles.settingsPanelHeader}>
@@ -264,7 +269,7 @@ export default class Settings extends Component<Props, State> {
       </div>
       <div className={styles.settingsPanelHeaderItem}>
         Community Support:{' '}
-        <a onClick={this.openDiscordLink}>{discordInviteLink}</a>
+        <a onClick={this.openDiscordLink}>{DISCORD_INVITE_LINK}</a>
       </div>
     </div>
   )

diff --git a/app/core/constants.js b/app/core/constants.js
@@ -5,6 +5,9 @@ import nodes from './nodes.json'
 export const NEON_WALLET_RELEASE_LINK =
   'https://github.com/CityOfZion/neon-wallet/releases'
 
+export const DISCORD_INVITE_LINK = 'https://discordapp.com/invite/R8v48YA'
+export const COZ_DONATIONS_ADDRESS = 'Adr3XjZ5QDzVJrWvzmsTTchpLRRGSzgS5A'
+
 export const ASSETS = {
   NEO: 'NEO',
   GAS: 'GAS'