Commit Graph

3479 Commits

Author SHA1 Message Date
Mariano Aguero 53618c984d Typo 2018-11-21 20:12:27 -03:00
Gabriel Rodríguez Alsina c72c8dd470
Merge pull request #1228 from poanetwork/1227-bug-step4-no-alert-if-user-closes-or-refresh-the-page
Add before unload warning
2018-11-15 10:22:37 -03:00
Mariano Aguero 28107e095d Add before unload warning 2018-11-13 09:45:53 -03:00
Gabriel Rodríguez Alsina 9dd275051a
Merge pull request #1226 from poanetwork/issue#1221
(Bug) NoWeb3 screen flashes
2018-11-09 16:36:21 -03:00
Mariano Aguero 74a61e996b
Merge pull request #1225 from poanetwork/issue#1199-again
(Bug) Step3: field gas price custom empty by default
2018-11-09 16:04:26 -03:00
Mariano Aguero 93adecec2d Remove loader in provider 2018-11-09 14:37:31 -03:00
Mariano Aguero 2d629c5480 Update snapshots 2018-11-09 14:21:36 -03:00
Mariano Aguero 9bd609ac1a Solve glitch between the steps 2018-11-09 14:17:15 -03:00
Mariano Aguero d95c5707a9 Remove loader on these steps 2018-11-09 14:16:42 -03:00
Gabriel Rodríguez Alsina 8fdd3266e2
Merge pull request #1223 from poanetwork/issue#1218
(Bug) Can not start new crowdsale if previous one hasn't been finished
2018-11-09 11:35:41 -03:00
Gabriel Rodriguez Alsina f8435e2aa0 Tests. 2018-11-09 11:33:54 -03:00
Gabriel Rodriguez Alsina 46e67bd032 (chore) changed home components's names to something more meaningful - updated tests - refactored scss - added warning text about pending crowdsale creation. 2018-11-09 11:33:35 -03:00
Mariano Aguero 669d0be4c6 Add gas price custom default value 2018-11-09 09:31:40 -03:00
Mariano Aguero c41286185d Update snapshots 2018-11-09 00:07:02 -03:00
Mariano Aguero 047cb0ce19 Fix logo redirect 2018-11-09 00:01:51 -03:00
Mariano Aguero 9c7a7a1ff2 Fix check metamask when resume crowdsale 2018-11-09 00:01:28 -03:00
Mariano Aguero 053aa5298e Add resume or cancel crowdsale 2018-11-08 16:15:55 -03:00
Mariano Aguero 33f2b6a4f1
Merge pull request #1217 from poanetwork/feature/#1178-apply-new-design-to-noweb3-available
(Feature) Apply new design to "No Web3 Available" section
2018-11-08 09:12:32 -03:00
Gabriel Rodriguez Alsina fa3abd8714 (fix) test for NoWeb3 component. 2018-11-07 15:56:38 -03:00
Gabriel Rodriguez Alsina 6048792184 (Add) tests for ButtonNiftyWallet and ButtonMetamask. 2018-11-07 14:43:57 -03:00
Gabriel Rodriguez Alsina e3d5ae01c2 Added URLs to noweb3 component's links. 2018-11-07 14:26:17 -03:00
Gabriel Rodriguez Alsina 07b9e05a2a Merge branch 'integration/#1082-new-design' into feature/#1178-apply-new-design-to-noweb3-available
* integration/#1082-new-design:
  Fix typo
  Fix tests
  Fix integration branch
  Prettier
  Apply reload on crowdsales list
  Update snapshots
  Improvement to check metamask extension on home and stepOne
  Reload from home to stepOne
2018-11-07 14:07:22 -03:00
Gabriel Rodriguez Alsina 494de8942a (feature) added metamask and nifty wallet buttons 2018-11-07 14:06:29 -03:00
Fernando 6bf4fdc1be
Merge pull request #1196 from poanetwork/issue#1184
(Bug) Warning 'No wallet..' if wallet was installed after TW has been opened
2018-11-07 14:05:25 -03:00
fernandomg 9b72e184af Merge remote-tracking branch 'origin/issue#1184' into issue#1184
# Conflicts:
#	src/stores/Web3Store.js
2018-11-07 14:03:34 -03:00
fernandomg 9151075401 Fix typo 2018-11-07 14:00:53 -03:00
fernandomg 5ec0904305 Fix tests 2018-11-07 13:59:16 -03:00
fernandomg 663f52b9d0 Merge branch 'integration/#1082-new-design' into issue#1184
# Conflicts:
#	src/components/StepOne/index.js
#	src/stores/Web3Store.js
#	test/components/StepTwo/__snapshots__/StepTwoForm.spec.js.snap
#	test/components/StepTwo/__snapshots__/index.spec.js.snap
2018-11-07 13:18:43 -03:00
fernandomg d3f7d7bd76 Fix integration branch 2018-11-07 11:23:20 -03:00
Gabriel Rodriguez Alsina 7192430555 Merge branch 'integration/#1082-new-design' into feature/#1178-apply-new-design-to-noweb3-available
* integration/#1082-new-design:
  Fix wording
  Remove duplicate error on whitelist
  Added test to copy
  Update validations tests
  Add file upload improvements for step3 and tests
2018-11-07 10:13:12 -03:00
Gabriel Rodriguez Alsina 5d0afd2e9a (feature) added noweb3 component 2018-11-07 10:12:24 -03:00
Gabriel Rodríguez Alsina cd94cc91c7
Merge pull request #1207 from poanetwork/issue#1179
(Feature) Step 3 - CSV File Upload Improvements
2018-11-07 10:10:56 -03:00
Mariano Aguero a359eb6980 Prettier 2018-11-06 16:51:23 -03:00
Mariano Aguero 1d2345feed Merge branch 'integration/#1082-new-design' into issue#1184 2018-11-06 16:47:08 -03:00
Mariano Aguero 96b65a823a Merge branch 'issue#1179' of github.com:poanetwork/token-wizard into issue#1179 2018-11-06 16:29:17 -03:00
Fernando c3b5f58712
Merge branch 'integration/#1082-new-design' into issue#1179 2018-11-06 16:26:51 -03:00
Mariano Aguero d7bfa0fc47 Fix wording 2018-11-06 16:25:27 -03:00
fernandomg 9bd0ffb349 Fix merge conflicts 2018-11-06 16:19:52 -03:00
Fernando 72b2c3e277
Merge pull request #1210 from poanetwork/1169-test-step3-after-facelifting
(Tests) Add tests to Step3 after facelifting
2018-11-06 16:12:40 -03:00
Fernando ee2aff771c
Merge branch 'integration/#1082-new-design' into 1169-test-step3-after-facelifting 2018-11-06 15:19:04 -03:00
Fernando 223a3755cf
Merge pull request #1211 from poanetwork/issue#1188
(Feature) Modify 'Back' link so it behaves exactly as the browser's back button
2018-11-06 14:31:08 -03:00
Gabriel Rodriguez Alsina b0928e61a8 Merge branch 'integration/#1082-new-design' into issue#1179
* integration/#1082-new-design: (217 commits)
  Remove duplicated clocks on active tx row
  (fix) folder name's case fix
  (fix) trying to fix folder name's case in macos
  (fix) step 4 PR feedback
  (fix) Step 4 feedback.
  (fix) import files' names
  (fix) small visual update
  Added tests to webStore, and fake provider
  (fix) alert timeout
  (step 4) final styling adjustments
  (step 4) txstatus modal buttons
  (step 4) tx status table - current status
  Refactor StepFour
  remove unused file
  (feature) step 4 / integrate new styles after rebase
  Remove try catch and fix linter
  WIP tests
  Refactoring
  Update link
  Refactoring
  ...

# Conflicts:
#	src/utils/copy.js
2018-11-06 14:23:58 -03:00
Fernando b1f5aaebef
Merge branch 'integration/#1082-new-design' into issue#1188 2018-11-06 14:19:30 -03:00
Fernando d0c187c4e1
Merge pull request #1206 from poanetwork/feature/#1089-apply-new-design-to-step-5-crowdsale-page
(Feature) Apply new design to step 5: "Crowdsale page"
2018-11-06 14:16:46 -03:00
Gabriel Rodriguez Alsina 64a9162e72 Merge branch '2.0' into feature/#1089-apply-new-design-to-step-5-crowdsale-page_MERGE
* 2.0:
  Remove offset
2018-11-06 12:09:16 -03:00
Mariano Aguero 8318b55474 Update snapshots 2018-11-06 11:20:39 -03:00
Gabriel Rodriguez Alsina d795bb896c (fix) Added a CrowdsaleSummary for each strategy. (add) Added a bunch of tests. 2018-11-06 09:30:50 -03:00
Mariano Aguero 2c88107338 Update tests 2018-11-05 21:31:31 -03:00
Mariano Aguero 43f589b2d4 Add goBack functionality 2018-11-05 20:35:31 -03:00
Fernando 8301404776
Merge pull request #1209 from poanetwork/issue#1195
(Bug) Minted crowdsale: owner able to finalize before start
2018-11-05 17:05:31 -03:00