Commit Graph

  • b0ff08ad7f Merge pull request #87 from kennyt/fix-approvals Kenny Tran 2018-10-27 07:13:37 -07:00
  • 43244fece7
    Merge pull request #87 from kennyt/fix-approvals Kenny Tran 2018-10-27 07:13:37 -07:00
  • f066383c05 Fix approvals Kenny Tran 2018-10-26 18:08:38 -07:00
  • 112a5b07ec Fix approvals Kenny Tran 2018-10-26 18:08:38 -07:00
  • 8816338349 Update Addresses for Main Net; Update TokenLogo; Connect Web3Status (#86) Chi Kei Chan 2018-10-27 00:54:52 -07:00
  • 63440fd83f
    Update Addresses for Main Net; Update TokenLogo; Connect Web3Status (#86) Chi Kei Chan 2018-10-27 00:54:52 -07:00
  • 7a406d7ad7 Update Addresses for Main Net; Update TokenLogo; Connect Web3Status Chi Kei Chan 2018-10-27 00:54:30 -07:00
  • f947406bd6 Merge pull request #85 from kennyt/design-feedback Kenny Tran 2018-10-26 18:10:33 -07:00
  • 3e299ff243
    Merge pull request #85 from kennyt/design-feedback Kenny Tran 2018-10-26 18:10:33 -07:00
  • 277bbb7df0 Do approvals correctly Kenny Tran 2018-10-26 17:24:09 -07:00
  • ae9fa92546 Do approvals correctly Kenny Tran 2018-10-26 17:24:09 -07:00
  • faf411d043 Update summary to react to lastEditedField and add summary modal for all pages Kenny Tran 2018-10-26 15:53:47 -07:00
  • d15a3ceccc Update summary to react to lastEditedField and add summary modal for all pages Kenny Tran 2018-10-26 15:53:47 -07:00
  • 66960dac6c Implement feedback Kenny Tran 2018-10-26 13:51:36 -07:00
  • 9d8c5330b8 Implement feedback Kenny Tran 2018-10-26 13:51:36 -07:00
  • cec3b6cab8 Merge pull request #84 from kennyt/refactor-send Kenny Tran 2018-10-26 09:07:39 -07:00
  • 5987095eea
    Merge pull request #84 from kennyt/refactor-send Kenny Tran 2018-10-26 09:07:39 -07:00
  • cdb9baeaf6 Check for recipient for isValid Kenny Tran 2018-10-26 08:42:43 -07:00
  • 09e7002152 Check for recipient for isValid Kenny Tran 2018-10-26 08:42:43 -07:00
  • f744b94ead Refactor send to use web3connect Kenny Tran 2018-10-26 08:41:03 -07:00
  • 9fc59c4ffa Refactor send to use web3connect Kenny Tran 2018-10-26 08:41:03 -07:00
  • b45c5916c6 Add Approvals (#81) Chi Kei Chan 2018-10-25 06:19:26 -07:00
  • a28d0f0b96
    Add Approvals (#81) Chi Kei Chan 2018-10-25 06:19:26 -07:00
  • 89a183f8e6 Basic Desktop mode for now Chi Kei Chan 2018-10-25 06:16:09 -07:00
  • 8df3cd74a3 Various fixes Chi Kei Chan 2018-10-25 06:03:22 -07:00
  • 518376d532 Add Approvals; no watching pending tx yet Chi Kei Chan 2018-10-25 05:53:03 -07:00
  • 69ca6ed8c2 Refactor Swap (#80) Chi Kei Chan 2018-10-25 03:46:46 -07:00
  • dadbc4e441
    Refactor Swap (#80) Chi Kei Chan 2018-10-25 03:46:46 -07:00
  • ec414d064e Create QrCode component and use for recipient (#78) Kenny Tran 2018-10-25 03:46:11 -07:00
  • 6464e44310 Create QrCode component and use for recipient (#78) Kenny Tran 2018-10-25 03:46:11 -07:00
  • ad5c5249fe Handle errors in send page and add summary (#79) Kenny Tran 2018-10-25 03:28:43 -07:00
  • 4cb00d9528 Handle errors in send page and add summary (#79) Kenny Tran 2018-10-25 03:28:43 -07:00
  • 2ec6c4bc98 Refactor Swap Output Chi Kei Chan 2018-10-25 03:23:42 -07:00
  • 9112ffba43 Refactor Swap Input to not use drizzle Chi Kei Chan 2018-10-25 02:49:47 -07:00
  • 0aa576a3a5 Refactor calculateInput for ETH-TOKEN swap Chi Kei Chan 2018-10-24 16:07:02 -07:00
  • efa0d76d5a Remove unused variables and methods Kenny Tran 2018-10-24 15:26:47 -07:00
  • 1232ce6805 Remove output balance check Kenny Tran 2018-10-24 15:13:05 -07:00
  • 632ea1de87 Handle errors in send page and add summary Kenny Tran 2018-10-24 15:11:04 -07:00
  • f14aac7333 Create QrCode component and use for recipient Kenny Tran 2018-10-24 11:18:20 -07:00
  • 4da61ded90 Implement Add Liquidity (#77) Chi Kei Chan 2018-10-23 15:19:49 -07:00
  • 509ddaeaa0
    Implement Add Liquidity (#77) Chi Kei Chan 2018-10-23 15:19:49 -07:00
  • 14cf341727 Finish Add Liquidity Chi Kei Chan 2018-10-23 15:19:03 -07:00
  • f4a17478bc Add Liquidity UI and Validation Chi Kei Chan 2018-10-23 11:00:10 -07:00
  • 5a8d47501e CSS fixes Chi Kei Chan 2018-10-23 09:48:53 -07:00
  • 8a3cf7b424 Connect send page with exchange utils (#75) Kenny Tran 2018-10-23 09:19:21 -07:00
  • a4e0d11cef Connect send page with exchange utils (#75) Kenny Tran 2018-10-23 09:19:21 -07:00
  • 061c5362e8 Add exchangeRate and fix txId Kenny Tran 2018-10-23 09:16:49 -07:00
  • e0636e2235 Connect send page with exchange utils Kenny Tran 2018-10-22 18:27:19 -07:00
  • 7109cfb04e Create send/transfer utils (#71) Kenny Tran 2018-10-22 13:48:38 -07:00
  • b1a5a6c867 Create send/transfer utils (#71) Kenny Tran 2018-10-22 13:48:38 -07:00
  • 323d2402e8
    Merge branch 'master' into send-exchange-utils Chi Kei Chan 2018-10-22 13:48:29 -07:00
  • f3feb8caac Reset after confirmed swap (#70) Kenny Tran 2018-10-22 13:47:20 -07:00
  • 4738629887 Reset after confirmed swap (#70) Kenny Tran 2018-10-22 13:47:20 -07:00
  • 40f24eef67
    Merge branch 'master' into reset-after-confirmed-swap Chi Kei Chan 2018-10-22 13:47:08 -07:00
  • 4524987898 Add Web3Connect Watcher to replace drizzle (#74) Chi Kei Chan 2018-10-22 13:42:29 -07:00
  • 6ea7b6ac0a
    Add Web3Connect Watcher to replace drizzle (#74) Chi Kei Chan 2018-10-22 13:42:29 -07:00
  • 9e13e59646 Partial refactor of Swap; Finish calc for AddLiquidity Chi Kei Chan 2018-10-22 13:41:34 -07:00
  • 05c034faa8 Reset after confirmed swap Kenny Tran 2018-10-20 06:44:33 -07:00
  • f06a7486e9 Web3 Connect balance watching Chi Kei Chan 2018-10-22 00:01:11 -07:00
  • 27452b2e73 Implement Basic web3connect Chi Kei Chan 2018-10-21 21:24:35 -07:00
  • 261310ea9b Refactor CurrencyInputPanel Chi Kei Chan 2018-10-21 18:07:03 -07:00
  • 57a05471e5 Refactor CurrencyInputPanel Chi Kei Chan 2018-10-21 18:07:03 -07:00
  • 7fac46fdbc Fix Approval and Unlocks integration (#73) Chi Kei Chan 2018-10-20 22:52:55 -07:00
  • f44d074907
    Fix Approval and Unlocks integration (#73) Chi Kei Chan 2018-10-20 22:52:55 -07:00
  • bb51ea4ab3 Fix Approval and Unlocks integration Chi Kei Chan 2018-10-20 22:51:56 -07:00
  • 631987b2a7 Create send/transfer utils Kenny Tran 2018-10-20 11:04:40 -07:00
  • ea4005ea28 Approve / unlock functionality (#66) Kenny Tran 2018-10-19 22:53:14 -07:00
  • ade904d22e Approve / unlock functionality (#66) Kenny Tran 2018-10-19 22:53:14 -07:00
  • 7e39b29d2a Pending transactions modal (#67) Kenny Tran 2018-10-19 22:52:30 -07:00
  • 370d9e1009 Pending transactions modal (#67) Kenny Tran 2018-10-19 22:52:30 -07:00
  • a68736c191 Add focus-within border (#68) Kenny Tran 2018-10-19 22:49:42 -07:00
  • 9db8851518 Add focus-within border (#68) Kenny Tran 2018-10-19 22:49:42 -07:00
  • b8806cf120 Add focus-within border Kenny Tran 2018-10-19 15:55:43 -07:00
  • f4b51d8d44 Add pending icon Kenny Tran 2018-10-19 15:46:10 -07:00
  • 8d09ba6d31 Create pending transactions modal Kenny Tran 2018-10-19 15:44:22 -07:00
  • 47838f977e Add pending icon and use Kenny Tran 2018-10-19 12:58:19 -07:00
  • 9bf1dea8e0 Use web3 toHex util Kenny Tran 2018-10-19 11:09:40 -07:00
  • e118b67a00 Add deepEqual and shouldComponentUpdate Kenny Tran 2018-10-19 10:41:40 -07:00
  • 8e2293bb84 Change validateBalance to shouldValidateBalance Kenny Tran 2018-10-19 10:13:16 -07:00
  • c869fbaa8f Refactor out getdecimal/getbalance. Add in approval limit Kenny Tran 2018-10-19 10:10:25 -07:00
  • 53b193a006 Initial approve / unlock functionality Kenny Tran 2018-10-18 16:08:20 -07:00
  • fbaaf0b27e Implement inactive state for Swap CTA (#42) Kenny Tran 2018-10-18 11:42:11 -07:00
  • 204313f6f0 Implement inactive state for Swap CTA (#42) Kenny Tran 2018-10-18 11:42:11 -07:00
  • 3d9ef15b2e Check for input/output errors in validSwap Kenny Tran 2018-10-18 07:13:07 -07:00
  • 85352dc1e5
    Merge branch 'master' into inactive-cta-swap Chi Kei Chan 2018-10-17 18:15:35 -07:00
  • bc19003b6e Create error state for currency input (#43) Kenny Tran 2018-10-17 18:13:48 -07:00
  • 6c168635ff Create error state for currency input (#43) Kenny Tran 2018-10-17 18:13:48 -07:00
  • a3f8c33b79 Use big number for balance comparison Kenny Tran 2018-10-17 15:30:46 -07:00
  • b0d3cc7aba Use mercury gray for inactive CTA Kenny Tran 2018-10-17 11:36:27 -07:00
  • 0c6f722a00 Have isValid return a bool Kenny Tran 2018-10-16 11:55:24 -07:00
  • 3c78fc6002 Disable Swap CTA if not valid Kenny Tran 2018-10-16 11:53:37 -07:00
  • 52b7e141ea Implement inactive state for Swap CTA Kenny Tran 2018-10-16 11:23:32 -07:00
  • 9f8e4b2d78 Add proptypes and convert to float before compare Kenny Tran 2018-10-17 10:56:53 -07:00
  • e578dd396b Create error functionality for redux Kenny Tran 2018-10-17 10:46:42 -07:00
  • 54a82f8635 Create error state for currency input Kenny Tran 2018-10-16 15:14:20 -07:00
  • a69d8231a8 Handle frontend route in Netlify (#46) Chi Kei Chan 2018-10-17 03:42:41 -07:00
  • c691cfabe8
    Handle frontend route in Netlify (#46) Chi Kei Chan 2018-10-17 03:42:41 -07:00
  • b9b1b8cbb1 Add route handling to netlify Chi Kei Chan 2018-10-17 03:40:13 -07:00
  • e2030ab393 Add Netlify route Chi Kei Chan 2018-10-17 03:36:36 -07:00
  • c72d589e87 Add all smart trade methods to swap (#45) Chi Kei Chan 2018-10-17 01:43:13 -07:00