Commit Graph

3479 Commits

Author SHA1 Message Date
fernandomg ed71eb28f3 Add test for StepThree component 2018-11-01 15:57:49 -03:00
fernandomg 4076188e38 Add StepThreeFormMintedCapped tests 2018-11-01 15:57:41 -03:00
fernandomg ce04343fed Add StepThreeFormDutchAuction tests 2018-11-01 15:57:25 -03:00
Mariano Aguero 7851f886f7 Add file upload improvements for step3 and tests 2018-11-01 15:39:52 -03:00
Mariano Aguero 4bfa37cdbb
Merge branch 'integration/#1082-new-design' into issue#1184 2018-11-01 09:03:31 -03:00
Gabriel Rodriguez Alsina 6ba57375cf (fix) Step 4 feedback. 2018-10-31 17:00:15 -03:00
Gabriel Rodriguez Alsina 3764ffd0a6 Merge branch 'feature/#1088-apply-new-design-to-step-4-publish' into feature/#1089-apply-new-design-to-step-5-crowdsale-page
* feature/#1088-apply-new-design-to-step-4-publish:
  (fix) import files' names
  Added tests to webStore, and fake provider
  Remove try catch and fix linter
  WIP tests
  Refactoring
  Update link
  Refactoring
  Refactoring
  Remove spec
  Move switch , remove load
  Update DApp loading code considering upcoming breaking change in metaMask
  Set default custom price
  Check if address is changed
2018-10-31 15:22:39 -03:00
Gabriel Rodriguez Alsina af149d9308 (fix) import files' names 2018-10-31 15:21:47 -03:00
Gabriel Rodriguez Alsina ff51bbf427 Merge branch 'integration/#1082-new-design' into feature/#1088-apply-new-design-to-step-4-publish
* integration/#1082-new-design:
  Added tests to webStore, and fake provider
  Remove try catch and fix linter
  WIP tests
  Refactoring
  Update link
  Refactoring
  Refactoring
  Remove spec
  Move switch , remove load
  Update DApp loading code considering upcoming breaking change in metaMask
  Set default custom price
  Check if address is changed
2018-10-31 15:16:47 -03:00
Gabriel Rodriguez Alsina b025995ea2 (feature) step 5 - finished styling 2018-10-31 15:14:50 -03:00
Gabriel Rodriguez Alsina c12af2cf94 (feature) step 5 - styling elements 2018-10-31 09:28:45 -03:00
Gabriel Rodriguez Alsina 89df0e9a8b (feature) step 5 elements 2018-10-30 17:23:38 -03:00
Fernando c5cf74b199
Merge pull request #1203 from poanetwork/issue#1199
(Bug) Step3: field gas price custom empty by default
2018-10-30 16:34:09 -03:00
Fernando d79dd7a192
Merge pull request #1177 from poanetwork/feature/breaking-change-metamask-new-design
(Fix) Update DApp loading code considering upcoming Breaking Change in MetaMask (Branch Integration Design)
2018-10-30 16:29:09 -03:00
Gabriel Rodriguez Alsina 87943f81f1 (fix) small visual update 2018-10-30 07:50:34 -03:00
Mariano Aguero 94f8b2b724 Added tests to webStore, and fake provider 2018-10-29 20:43:30 -03:00
Gabriel Rodriguez Alsina 26d6503196 (fix) alert timeout 2018-10-29 17:07:03 -03:00
Gabriel Rodriguez Alsina f1a3cbf9af Merge branch '2.0' into integration/#1082-new-design
* 2.0:
  Check if address is changed
2018-10-29 17:04:57 -03:00
Gabriel Rodriguez Alsina 5f3e1a42f5 (step 4) final styling adjustments 2018-10-29 16:27:58 -03:00
Gabriel Rodriguez Alsina 7fcc83cd1f (step 4) txstatus modal buttons 2018-10-26 18:05:56 -03:00
Gabriel Rodriguez Alsina 3c41c149c8 (step 4) tx status table - current status 2018-10-26 17:30:13 -03:00
Mariano Aguero 6a4672fbed Refactor StepFour 2018-10-26 16:15:15 -03:00
Gabriel Rodriguez Alsina a87fbcec4a remove unused file 2018-10-26 15:06:19 -03:00
Gabriel Rodriguez Alsina 9bb88083d3 (feature) step 4 / integrate new styles after rebase 2018-10-26 15:04:47 -03:00
Mariano Aguero ab98ed6acf Remove try catch and fix linter 2018-10-26 14:20:27 -03:00
Mariano Aguero d95de0e03b WIP tests 2018-10-26 14:20:09 -03:00
Mariano Aguero 4ab7cc525f Refactoring 2018-10-26 14:18:25 -03:00
Mariano Aguero fe88d733b3 Update link 2018-10-26 14:18:25 -03:00
Mariano Aguero 234a2d321b Refactoring 2018-10-26 14:18:25 -03:00
Mariano Aguero 14c89ee7e3 Refactoring 2018-10-26 14:18:25 -03:00
Mariano Aguero 9712f99c86 Remove spec 2018-10-26 14:18:25 -03:00
Mariano Aguero e8f3b27aef Move switch , remove load 2018-10-26 14:18:25 -03:00
Mariano Aguero 92e504ff24 Update DApp loading code considering upcoming breaking change in metaMask 2018-10-26 14:18:05 -03:00
Fernando 284af7f8ee
Merge pull request #1202 from poanetwork/issue#1201
(Feature) Update contribution page if account was switched in wallet
2018-10-26 12:05:49 -03:00
Mariano Aguero 15cce8b764 Apply reload on crowdsales list 2018-10-26 10:22:47 -03:00
Mariano Aguero f09ee41473 Update snapshots 2018-10-26 10:22:47 -03:00
Mariano Aguero a6c3dd152f Improvement to check metamask extension on home and stepOne 2018-10-26 10:22:47 -03:00
Mariano Aguero 0668810b7b Reload from home to stepOne 2018-10-26 10:22:47 -03:00
Mariano Aguero 89b036daaa Set default custom price 2018-10-26 09:12:49 -03:00
Gabriel Rodriguez Alsina 6aaa258556 Merge branch 'integration/#1082-new-design' into feature/#1088-apply-new-design-to-step-4-publish_MERGE
* integration/#1082-new-design: (242 commits)
  Refactor post rebase
  (fix) removed unused vars
  Clear history on back button
  Reset state on history push
  (fix) latest feedback
  Update tests
  Add stores to reset
  (fix) PR feedback.
  (fix) Navigation paths.
  (fix) Feedback fixing for Step 3 PR.
  Update package
  Fix strategy problem
  (fix) small margin fix
  (feat) step 3 / last visual details
  (feat / fix) step 3 / 2 final touches
  (feature) step 3 / dutch auction layout
  (fix) proper steps 1 / 2 / 3 navigation
  Fix tests
  Fix prettier
  Add best practice mobx with slice
  ...

# Conflicts:
#	package-lock.json
#	src/App.js
#	src/assets/stylesheets/application.css
#	src/assets/stylesheets/application_styles.css
#	src/assets/stylesheets/styles.css
#	src/assets/stylesheets/v2.0/components/_BorderedBlock.scss
#	src/assets/stylesheets/v2.0/components/_ButtonCSV.scss
#	src/assets/stylesheets/v2.0/components/_FlexTable.scss
#	src/assets/stylesheets/v2.0/components/_StepContent.scss
#	src/assets/stylesheets/v2.0/components/_index.scss
#	src/assets/stylesheets/v2.0/helpers/_table-mixins.scss
#	src/assets/stylesheets/v2.0/styles.scss
#	src/components/Common/ButtonContinue.js
#	src/components/Common/CrowdsalesList.js
#	src/components/Common/DisplayField.js
#	src/components/Common/DisplayTextArea.js
#	src/components/Common/ReservedTokensTable.js
#	src/components/Common/TxProgressStatus.js
#	src/components/StepFour/index.js
#	src/components/StepOne/index.js
#	src/components/StepThree/StepThreeFormDutchAuction.js
#	src/components/StepThree/StepThreeFormMintedCapped.js
#	src/components/StepTwo/StepTwoForm.js
#	src/components/manage/index.js
#	src/utils/blockchainHelpers.js
#	src/utils/constants.js
#	src/utils/utils.js
#	submodules/token-wizard-test-automation
2018-10-25 16:21:42 -03:00
Mariano Aguero 0bd896eea6 Refactor post rebase 2018-10-25 15:56:15 -03:00
Gabriel Rodriguez Alsina 716760c342 (fix) removed unused vars 2018-10-25 15:32:36 -03:00
Mariano Aguero 96f4d02f8e Clear history on back button 2018-10-25 15:32:35 -03:00
Mariano Aguero f8946da2a0 Reset state on history push 2018-10-25 15:32:35 -03:00
Gabriel Rodriguez Alsina e92eec04ae (fix) latest feedback 2018-10-25 15:32:35 -03:00
Mariano Aguero 7e7cb73508 Update tests 2018-10-25 15:32:23 -03:00
Mariano Aguero f97ec7b4e9 Add stores to reset 2018-10-25 15:32:23 -03:00
Gabriel Rodriguez Alsina e27c495598 (fix) PR feedback. 2018-10-25 15:32:23 -03:00
Gabriel Rodriguez Alsina caea6973b7 (fix) Navigation paths. 2018-10-25 15:32:10 -03:00
Gabriel Rodriguez Alsina db81521bc1 (fix) Feedback fixing for Step 3 PR. 2018-10-25 15:32:10 -03:00