     render: ->
         <Panel header={@render_header()}>
             {@render_error()}
-            {@render_add_payment_method() if @state.state in ['add_new', 'submit']}
+            {@render_add_payment_method() if @state.state in ['add_new']}
             {@render_payment_methods()}
         </Panel>
 
 
 InvoiceHistory = rclass
+    displayName : "InvoiceHistory"
     render_header: ->
         <span>
             <Icon name="list-alt" /> Invoice History



BillingPage = rclass
    render: ->
        <div>
            <PaymentMethods flux={@props.flux} />
            <InvoiceHistory />
        </div>

render = (flux) ->
    <FluxComponent flux={flux}>
        <BillingPage />
    </FluxComponent>


exports.render_billing = (dom_node, flux) ->
    React.render(render(flux), dom_node)


                    token : response.id
                    cb    : cb
        ], (err) =>
            @setState(error: err, submitting:false)
            if not err
                @props.on_close()
        )


    render_payment_method_field: (field, control) ->
        if field == 'State' and @state.new_payment_info.address_country != "United States"
            return
        <Row key={field}>
            <Col xs=4>
