Skip to content

Commit

Permalink
Merge pull request #407 from nypublicradio/mwalsh/MEM-79
Browse files Browse the repository at this point in the history
MEM-79
  • Loading branch information
walsh9 authored Apr 20, 2022
2 parents e14b924 + e987183 commit 6c25d06
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 16 deletions.
1 change: 0 additions & 1 deletion app/routes/profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export default Route.extend(AuthenticatedRouteMixin, {
return this.get('currentUser.user');
},
setupController(controller, model) {
controller.set('orders', this.store.findAll('order'));
controller.send('updateEmailStatus', get(model, 'email'));
return this._super(controller, model);
},
Expand Down
3 changes: 2 additions & 1 deletion app/templates/profile.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@

</div>
{{nypr-accounts/membership-card
pledges=orders
pledgeManagerEnabled=false
customStatusMessage="Thanks for visiting this page! Our Member Center is currently unavailable while we make improvements that we hope you will find useful. If you have questions about your membership or need to make changes at this time, please <a href='https://www.wqxr.org/contact' target='_blank' rel='nofollow'>contact Listener Services here.</a>"
siteName=siteName
siteDomain=siteDomain
user=model
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"loader.js": "^4.2.3",
"morgan": "^1.6.1",
"normalize.css": "^8.0.0",
"nypr-account-settings": "~0.2.7",
"nypr-account-settings": "0.2.10",
"nypr-ads": "^0.1.0",
"nypr-audio-services": "^0.6.1",
"nypr-auth": "^0.2.5",
Expand Down
9 changes: 0 additions & 9 deletions tests/acceptance/profile-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -352,13 +352,4 @@ module('Acceptance | profile', function(hooks) {

assert.equal(findAll('.nypr-social-connect__link').length, 1);
});

test('logged in without fb account does not show manage link', async function(assert) {
server.create('user');
authenticateSession({access_token: 'foo'});

await visit('/profile');

assert.equal(findAll('.nypr-social-connect__link').length, 0);
});
});
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9915,10 +9915,10 @@ nwsapi@^2.0.9:
version "2.1.4"
resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz#e006a878db23636f8e8a67d33ca0e4edf61a842f"

nypr-account-settings@~0.2.7:
version "0.2.7"
resolved "https://registry.yarnpkg.com/nypr-account-settings/-/nypr-account-settings-0.2.7.tgz#fc9b43d3dbf593036f1002a15d942adb9335e97f"
integrity sha512-9vg0XSKmTBfy50AjPfYxYftu+YZAbuE9rfPJkkXAwHMDwtHb/hjFYAqRVoQmvtci4Ys1vlNbXiVP5yOjibkbDg==
nypr-account-settings@0.2.10:
version "0.2.10"
resolved "https://registry.yarnpkg.com/nypr-account-settings/-/nypr-account-settings-0.2.10.tgz#ecb84bf848e89e3355057c7c526982c3e969878d"
integrity sha512-rWxJzKQzCCbKVbAAyhxcrC724hl2cLUuyV7V9PSkPakjw05zRHh9z3X352duYcfM2o5ANW5IUhnNkX9UzyhCow==
dependencies:
ember-changeset "^2.0.0"
ember-changeset-validations "^2.1.0"
Expand Down

0 comments on commit 6c25d06

Please sign in to comment.