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

(Feature) [xDai] - Visually differentiate networks#1431

Merged
fernandomg merged 46 commits intofeature/#1353-xDai-compatibilityfrom
feature/#1426-xDai-visually-differentiate-networks
Oct 8, 2020
Merged

(Feature) [xDai] - Visually differentiate networks#1431
fernandomg merged 46 commits intofeature/#1353-xDai-compatibilityfrom
feature/#1426-xDai-visually-differentiate-networks

Conversation

@alongoni
Copy link
Contributor

@alongoni alongoni commented Oct 5, 2020

Closes #1426
color-xdai

fernandomg and others added 30 commits September 30, 2020 16:33
Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>
Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>
Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>
Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>
Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>
Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>
Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>
Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>
Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>
Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>
…xDai-use-generic-config

# Conflicts:
#	src/config/networks/__tests__/networks.test.ts
#	src/config/networks/network.d.ts
…ion file

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>
Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>
Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>
- also added 'local' as a network for testing purposes
Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>
…ai-use-generic-config

# Conflicts:
#	src/config/networks/__tests__/networks.test.ts
#	src/config/networks/mainnet.ts
#	src/config/networks/network.d.ts
#	src/config/networks/rinkeby.ts
#	src/config/networks/xdai.ts
#	src/logic/wallets/getWeb3.ts
@ghost
Copy link

ghost commented Oct 6, 2020

Travis automatic deployment:
https://pr1431--safereact.review.gnosisdev.com/app

@Agupane Agupane self-assigned this Oct 7, 2020
@fernandomg fernandomg marked this pull request as ready for review October 8, 2020 13:56
Copy link
Contributor

@nicosampler nicosampler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just found an inconsistency in the label we are showing at the top of the sidebar.
For Mainnet it says "Mainnet" which is reasonable
For Rinkenby it says "Rinkeby" which is reasonable
For xDai it says "xDai Stake" which is not consistent with the other, also, IMHO it should not say "Stake"

The code and the Apps look good to me.

@fernandomg
Copy link
Contributor

I'm having an issue with the Receive Modal:

@Agupane, @alongoni

image

@ghost
Copy link

ghost commented Oct 8, 2020

Travis automatic deployment:
https://pr1431--safereact.review.gnosisdev.com/app

…ai-visually-differentiate-networks

# Conflicts:
#	src/components/App/ReceiveModal.tsx
@ghost
Copy link

ghost commented Oct 8, 2020

Travis automatic deployment:
https://pr1431--safereact.review.gnosisdev.com/app

@fernandomg fernandomg self-assigned this Oct 8, 2020
@fernandomg fernandomg removed their request for review October 8, 2020 18:41
@ghost
Copy link

ghost commented Oct 8, 2020

Travis automatic deployment:
https://pr1431--safereact.review.gnosisdev.com/app

@fernandomg fernandomg merged commit dc77aeb into feature/#1353-xDai-compatibility Oct 8, 2020
@fernandomg fernandomg deleted the feature/#1426-xDai-visually-differentiate-networks branch October 8, 2020 22:50
@github-actions github-actions bot locked and limited conversation to collaborators Oct 8, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants