Skip to content
This repository has been archived by the owner on Nov 10, 2023. It is now read-only.

Commit

Permalink
Development to master (#318)
Browse files Browse the repository at this point in the history
* Adds cookie permissions to localStorage/redux state

* Adds action

* Adds files to git

* (fix) linting issues

* (update) flow-typed

* (update) .eslint and .flowconfig

* (add) cookie banner

* Finish cookie banner implementation

* (Add) checkbox's disabled style.

* Removes redux for cookiesStorage

* Fix cookieStore deletion

* Fixs cookies acceptance

* Fixs cookies banner verbiage
Fix "x" in wrong place for snackbar messages

* (remove) unused library

* Adds cookies utils
Replaces localStorage with cookies
Adds js-cookie

* (fix) added correct polished library and import, updated flow-typed

* (update) removed polish flow type, added js-cookie flow type

* Add link to cookie policy, use generic links for legal docs

* Remove link to cookie policy from sidebar, link cookie policy in the banner

* Let the user re-open the cookie banner

* remove withMutations from cookies reducer, move utils/cookies to logic/cookies

* Now the sidebar closes when the cookie banner is toggled

* Feature #169: Intercom (#301)

* Implements intercom
Adds REACT_APP_INTERCOM_ID_MAINNET and REACT_APP_INTERCOM_ID_RINKEBY env vars

* Adds .env.example

* Adds intercom env vars

* Updates env vars
Replaces "rinkeby" and "mainnet" with "non-production" and "production"

* Now loads intercom after the user accepted the analytics

* Add env variable for production intercom id

* Update .env.example

* Removes react-intercom
Fixs getIntercomId with default dev appID
Now loads intercom as script

* Renegerate flow-types

* Remove 'Hide zero balances' (#310)

* Use medium font size for 'select an asset' label (#312)

* Feature #272: Google Analytics (#299)

* Adds google analytics tracking for every route

* Adds cookies acceptance check before tracking

* Fix react-ga dependency

* Fix cookieStore deletion

* Merge with #189-cookie-banner

* Fixs react ga version
Refactored HOC with hooks

* Fix TYPO

* Fix path for cookies utils

* Fix imports

* remove flow type definition for polish

* Add GA ID log

* Fix load GA After cookies acceptance

* Feature #224: Activate tokens automatically (#300)

* Replace 'Manage Tokens' with 'Manage List'

* prevent 301 redirects

* Add `BLACKLISTED_TOKENS` key to persist through immortal

* Add store/action to extract _activate tokens by its balance_

- keeps already activated tokens
- discards blacklisted tokens
- adds tokens whose vales are bigger than zero and are not blacklisted

* Add `blacklistedTokens` list to safe's store

* Display activeTokensByBalance in 'Balances' screen

* Enable token's blacklisting functionality in Tokens List

* Retrieve balance from API

* Rename action to `activateTokensByBalance`

* Fix linting errors

- line too long
- required return

* Do not persist a separate list into `BLACKLISTED_TOKENS`
  • Loading branch information
mmv08 authored Dec 5, 2019
1 parent 6643955 commit c2b2ccd
Show file tree
Hide file tree
Showing 57 changed files with 1,230 additions and 970 deletions.
11 changes: 11 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# You can leave this empty for rinkeby or use "mainnet"
REACT_APP_NETWORK=

# For Rinkeby network
REACT_APP_GOOGLE_ANALYTICS_ID_RINKEBY=

# For Mainnet network (no needed on dev mode)
REACT_APP_GOOGLE_ANALYTICS_ID_MAINNET=

# For production environments
REACT_APP_INTERCOM_ID=
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ flow-typed
flow-typed/npm
config
scripts
migrations
migrations
30 changes: 30 additions & 0 deletions flow-typed/npm/js-cookie_v2.x.x.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// flow-typed signature: a23fa96dc9c75f8931650efff45badee
// flow-typed version: c6154227d1/js-cookie_v2.x.x/flow_>=v0.104.x

declare module 'js-cookie' {
declare type CookieOptions = {
expires?: number | Date,
path?: string,
domain?: string,
secure?: boolean,
...
}
declare type ConverterFunc = (value: string, name: string) => string;
declare type ConverterObj = {
read: ConverterFunc,
write: ConverterFunc,
...
};
declare class Cookie {
defaults: CookieOptions;
set(name: string, value: mixed, options?: CookieOptions): void;
get(...args: Array<void>): { [key: string]: string, ... };
get(name: string, ...args: Array<void>): string | void;
remove(name: string, options?: CookieOptions): void;
getJSON(name: string): Object;
withConverter(converter: ConverterFunc | ConverterObj): this;
noConflict(): this;
}

declare module.exports: Cookie;
}
282 changes: 282 additions & 0 deletions flow-typed/npm/react-ga_vx.x.x.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,282 @@
// flow-typed signature: 07c4a3f5d999e123126e4525eece89d8
// flow-typed version: <<STUB>>/react-ga_vlatest/flow_v0.112.0

/**
* This is an autogenerated libdef stub for:
*
* 'react-ga'
*
* Fill this stub out by replacing all the `any` types.
*
* Once filled out, we encourage you to share your work with the
* community by sending a pull request to:
* https://github.com/flowtype/flow-typed
*/

declare module 'react-ga' {
declare module.exports: any;
}

/**
* We include stubs for each file inside this npm package in case you need to
* require those files directly. Feel free to delete any files that aren't
* needed.
*/
declare module 'react-ga/core' {
declare module.exports: any;
}

declare module 'react-ga/demo/app/Events' {
declare module.exports: any;
}

declare module 'react-ga/demo/app' {
declare module.exports: any;
}

declare module 'react-ga/demo/app/Router' {
declare module.exports: any;
}

declare module 'react-ga/demo/app/withTracker' {
declare module.exports: any;
}

declare module 'react-ga/demo' {
declare module.exports: any;
}

declare module 'react-ga/dist/esm/components/OutboundLink' {
declare module.exports: any;
}

declare module 'react-ga/dist/esm/core' {
declare module.exports: any;
}

declare module 'react-ga/dist/esm' {
declare module.exports: any;
}

declare module 'react-ga/dist/esm/utils/console/log' {
declare module.exports: any;
}

declare module 'react-ga/dist/esm/utils/console/warn' {
declare module.exports: any;
}

declare module 'react-ga/dist/esm/utils/format' {
declare module.exports: any;
}

declare module 'react-ga/dist/esm/utils/loadGA' {
declare module.exports: any;
}

declare module 'react-ga/dist/esm/utils/mightBeEmail' {
declare module.exports: any;
}

declare module 'react-ga/dist/esm/utils/removeLeadingSlash' {
declare module.exports: any;
}

declare module 'react-ga/dist/esm/utils/testModeAPI' {
declare module.exports: any;
}

declare module 'react-ga/dist/esm/utils/toTitleCase' {
declare module.exports: any;
}

declare module 'react-ga/dist/esm/utils/trim' {
declare module.exports: any;
}

declare module 'react-ga/dist/react-ga-core' {
declare module.exports: any;
}

declare module 'react-ga/dist/react-ga-core.min' {
declare module.exports: any;
}

declare module 'react-ga/dist/react-ga' {
declare module.exports: any;
}

declare module 'react-ga/dist/react-ga.min' {
declare module.exports: any;
}

declare module 'react-ga/src/components/OutboundLink' {
declare module.exports: any;
}

declare module 'react-ga/src/core' {
declare module.exports: any;
}

declare module 'react-ga/src' {
declare module.exports: any;
}

declare module 'react-ga/src/utils/console/log' {
declare module.exports: any;
}

declare module 'react-ga/src/utils/console/warn' {
declare module.exports: any;
}

declare module 'react-ga/src/utils/format' {
declare module.exports: any;
}

declare module 'react-ga/src/utils/loadGA' {
declare module.exports: any;
}

declare module 'react-ga/src/utils/mightBeEmail' {
declare module.exports: any;
}

declare module 'react-ga/src/utils/removeLeadingSlash' {
declare module.exports: any;
}

declare module 'react-ga/src/utils/testModeAPI' {
declare module.exports: any;
}

declare module 'react-ga/src/utils/toTitleCase' {
declare module.exports: any;
}

declare module 'react-ga/src/utils/trim' {
declare module.exports: any;
}

declare module 'react-ga/version-bower' {
declare module.exports: any;
}

// Filename aliases
declare module 'react-ga/core.js' {
declare module.exports: $Exports<'react-ga/core'>;
}
declare module 'react-ga/demo/app/Events.jsx' {
declare module.exports: $Exports<'react-ga/demo/app/Events'>;
}
declare module 'react-ga/demo/app/index' {
declare module.exports: $Exports<'react-ga/demo/app'>;
}
declare module 'react-ga/demo/app/index.jsx' {
declare module.exports: $Exports<'react-ga/demo/app'>;
}
declare module 'react-ga/demo/app/Router.jsx' {
declare module.exports: $Exports<'react-ga/demo/app/Router'>;
}
declare module 'react-ga/demo/app/withTracker.jsx' {
declare module.exports: $Exports<'react-ga/demo/app/withTracker'>;
}
declare module 'react-ga/demo/index' {
declare module.exports: $Exports<'react-ga/demo'>;
}
declare module 'react-ga/demo/index.jsx' {
declare module.exports: $Exports<'react-ga/demo'>;
}
declare module 'react-ga/dist/esm/components/OutboundLink.js' {
declare module.exports: $Exports<'react-ga/dist/esm/components/OutboundLink'>;
}
declare module 'react-ga/dist/esm/core.js' {
declare module.exports: $Exports<'react-ga/dist/esm/core'>;
}
declare module 'react-ga/dist/esm/index' {
declare module.exports: $Exports<'react-ga/dist/esm'>;
}
declare module 'react-ga/dist/esm/index.js' {
declare module.exports: $Exports<'react-ga/dist/esm'>;
}
declare module 'react-ga/dist/esm/utils/console/log.js' {
declare module.exports: $Exports<'react-ga/dist/esm/utils/console/log'>;
}
declare module 'react-ga/dist/esm/utils/console/warn.js' {
declare module.exports: $Exports<'react-ga/dist/esm/utils/console/warn'>;
}
declare module 'react-ga/dist/esm/utils/format.js' {
declare module.exports: $Exports<'react-ga/dist/esm/utils/format'>;
}
declare module 'react-ga/dist/esm/utils/loadGA.js' {
declare module.exports: $Exports<'react-ga/dist/esm/utils/loadGA'>;
}
declare module 'react-ga/dist/esm/utils/mightBeEmail.js' {
declare module.exports: $Exports<'react-ga/dist/esm/utils/mightBeEmail'>;
}
declare module 'react-ga/dist/esm/utils/removeLeadingSlash.js' {
declare module.exports: $Exports<'react-ga/dist/esm/utils/removeLeadingSlash'>;
}
declare module 'react-ga/dist/esm/utils/testModeAPI.js' {
declare module.exports: $Exports<'react-ga/dist/esm/utils/testModeAPI'>;
}
declare module 'react-ga/dist/esm/utils/toTitleCase.js' {
declare module.exports: $Exports<'react-ga/dist/esm/utils/toTitleCase'>;
}
declare module 'react-ga/dist/esm/utils/trim.js' {
declare module.exports: $Exports<'react-ga/dist/esm/utils/trim'>;
}
declare module 'react-ga/dist/react-ga-core.js' {
declare module.exports: $Exports<'react-ga/dist/react-ga-core'>;
}
declare module 'react-ga/dist/react-ga-core.min.js' {
declare module.exports: $Exports<'react-ga/dist/react-ga-core.min'>;
}
declare module 'react-ga/dist/react-ga.js' {
declare module.exports: $Exports<'react-ga/dist/react-ga'>;
}
declare module 'react-ga/dist/react-ga.min.js' {
declare module.exports: $Exports<'react-ga/dist/react-ga.min'>;
}
declare module 'react-ga/src/components/OutboundLink.js' {
declare module.exports: $Exports<'react-ga/src/components/OutboundLink'>;
}
declare module 'react-ga/src/core.js' {
declare module.exports: $Exports<'react-ga/src/core'>;
}
declare module 'react-ga/src/index' {
declare module.exports: $Exports<'react-ga/src'>;
}
declare module 'react-ga/src/index.js' {
declare module.exports: $Exports<'react-ga/src'>;
}
declare module 'react-ga/src/utils/console/log.js' {
declare module.exports: $Exports<'react-ga/src/utils/console/log'>;
}
declare module 'react-ga/src/utils/console/warn.js' {
declare module.exports: $Exports<'react-ga/src/utils/console/warn'>;
}
declare module 'react-ga/src/utils/format.js' {
declare module.exports: $Exports<'react-ga/src/utils/format'>;
}
declare module 'react-ga/src/utils/loadGA.js' {
declare module.exports: $Exports<'react-ga/src/utils/loadGA'>;
}
declare module 'react-ga/src/utils/mightBeEmail.js' {
declare module.exports: $Exports<'react-ga/src/utils/mightBeEmail'>;
}
declare module 'react-ga/src/utils/removeLeadingSlash.js' {
declare module.exports: $Exports<'react-ga/src/utils/removeLeadingSlash'>;
}
declare module 'react-ga/src/utils/testModeAPI.js' {
declare module.exports: $Exports<'react-ga/src/utils/testModeAPI'>;
}
declare module 'react-ga/src/utils/toTitleCase.js' {
declare module.exports: $Exports<'react-ga/src/utils/toTitleCase'>;
}
declare module 'react-ga/src/utils/trim.js' {
declare module.exports: $Exports<'react-ga/src/utils/trim'>;
}
declare module 'react-ga/version-bower.js' {
declare module.exports: $Exports<'react-ga/version-bower'>;
}
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@
"history": "4.10.1",
"immortal-db": "^1.0.2",
"immutable": "^4.0.0-rc.9",
"js-cookie": "^2.2.1",
"material-ui-search-bar": "^1.0.0-beta.13",
"notistack": "https://github.com/gnosis/notistack.git#v0.9.4",
"optimize-css-assets-webpack-plugin": "5.0.3",
"polished": "^3.4.2",
"qrcode.react": "1.0.0",
"react": "16.12.0",
"react-dom": "16.12.0",
Expand All @@ -69,7 +71,8 @@
"reselect": "^4.0.0",
"squarelink": "^1.1.3",
"web3": "1.2.4",
"web3connect": "^1.0.0-beta.23"
"web3connect": "^1.0.0-beta.23",
"react-ga": "^2.7.0"
},
"devDependencies": {
"@babel/cli": "7.7.4",
Expand Down
Loading

0 comments on commit c2b2ccd

Please sign in to comment.