Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#496 One time links should be generated by our url shortener #615

Merged
merged 13 commits into from
Oct 2, 2019
Merged

#496 One time links should be generated by our url shortener #615

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c0908d1
#496 One time links should be generated by our url shortener
StanislavShevchenko Sep 18, 2019
bbdfa66
For payment we can simply use dapp.gooddollar.org/?paymentCode=
StanislavShevchenko Sep 19, 2019
9ff1195
double encodeURI
StanislavShevchenko Sep 19, 2019
d5ff8c1
marge in master
StanislavShevchenko Sep 19, 2019
ff48f19
fix double condition
StanislavShevchenko Sep 20, 2019
35b45bc
editing tests
StanislavShevchenko Sep 23, 2019
6f3fcd6
editing tests
StanislavShevchenko Sep 23, 2019
df8a4ab
fix in PR comments
StanislavShevchenko Sep 25, 2019
3b33704
Merge remote-tracking branch 'remotes/origin/master' into #496-One-ti…
StanislavShevchenko Sep 25, 2019
cc25fd8
fix test
StanislavShevchenko Sep 25, 2019
826db44
Merge remote-tracking branch 'origin/#496-One-time-links-should-be-ge…
StanislavShevchenko Sep 25, 2019
a203542
fix by comments
StanislavShevchenko Sep 27, 2019
38148f5
Merge remote-tracking branch 'remotes/origin/master' into #496-One-ti…
StanislavShevchenko Sep 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/config/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ const Config = {
!process.env.REACT_APP_THROW_SAVE_PROFILE_ERRORS || process.env.REACT_APP_THROW_SAVE_PROFILE_ERRORS === 'true',
withMockedFeeds: process.env.REACT_APP_WITH_MOCKED_FEEDS === 'true',
safariMobileKeyboardGuidedSize: process.env.REACT_APP_SAFARI_MOBILE_KEYBOARD_GUIDED_SIZE === 'true',
receiveUrl: process.env.REACT_APP_RECEIVE_URL || `${publicUrl}/AppNavigation/Dashboard/Send`,
sendUrl: process.env.REACT_APP_SEND_URL || `${publicUrl}/AppNavigation/Dashboard/Home`,
receiveUrl: process.env.REACT_APP_RECEIVE_URL || `${publicUrl}/Send`,
sirpy marked this conversation as resolved.
Show resolved Hide resolved
sendUrl: process.env.REACT_APP_SEND_URL || publicUrl,
sirpy marked this conversation as resolved.
Show resolved Hide resolved
ethereum: {
'42': {
network_id: 42,
Expand Down
4 changes: 2 additions & 2 deletions src/lib/share/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export function generateShareObject(title: string, text: string, url: string): S
return {
title,
text,
url: encodeURI(url),
url,
}
}

Expand Down Expand Up @@ -211,5 +211,5 @@ export function generateShareLink(action: ActionType = 'receive', params: {} = {
throw new Error(`Link couldn't be generated`)
}

return `${destination}${queryParams}`
return encodeURI(`${destination}${queryParams}`)
}